t5

mjreno · Aug 2, 2024 · 7627f97 · 7627f97
1 parent 202117d
commit 7627f97
Showing 1 changed file with 35 additions and 35 deletions.
diff --git a/.github/actions/test-netcdf-win/action.yml b/.github/actions/test-netcdf-win/action.yml
@@ -11,8 +11,6 @@ runs:
          unix2dos -n "%GITHUB_WORKSPACE%\modflow6\.github\common\compile_hdf5.sh" "%TEMP%\compile_hdf5.sh"
          unix2dos -n "%GITHUB_WORKSPACE%\modflow6\.github\common\compile_netcdfc.sh" "%TEMP%\compile_netcdfc.sh"
          unix2dos -n "%GITHUB_WORKSPACE%\modflow6\.github\common\compile_netcdff.sh" "%TEMP%\compile_netcdff.sh"
-#        unix2dos -n "%GITHUB_WORKSPACE%\modflow6\.github\common\configure_petsc.sh" "%TEMP%\configure_petsc.sh"
-#        unix2dos -n "%GITHUB_WORKSPACE%\modflow6\.github\common\compile_petsc.sh" "%TEMP%\compile_petsc.sh"
 
     - name: Hide Strawberry programs
       shell: bash
@@ -30,69 +28,73 @@ runs:
     - name: Setup oneAPI
       uses: ./modflow6/.github/actions/setup-par-oneapi
 
-#    - name: Restore PETSc cache
-#      id: petsc-cache
-#      uses: actions/cache/restore@v3
-#      with:
-#        path: petsc
-#        key: petsc-${{ runner.os }}-${{ steps.get-date.outputs.date }}
-
-#    - name: Download PETSc
-#      if: steps.petsc-cache.outputs.cache-hit != 'true'
-#      shell: bash
-#      run: |
-#        curl https://web.cels.anl.gov/projects/petsc/download/release-snapshots/petsc-3.20.5.tar.gz -O -J
-#        mkdir petsc
-#        tar -xzf petsc-3.20.5.tar.gz -C petsc --strip-components=1
-
     - name: Download HDF5, NetCDF
 #      if: steps.petsc-cache.outputs.cache-hit != 'true'
 #      from https://downloads.unidata.ucar.edu/netcdf/
 #      and https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.14/hdf5-1.14.4/src/
       shell: bash
       run: |
-        curl https://zlib.net/zlib-1.3.1.tar.gz -O -J
-        curl https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.14/hdf5-1.14.4/src/hdf5-1.14.4-3.tar.gz -O -J
         curl https://downloads.unidata.ucar.edu/netcdf-c/4.9.2/netcdf-c-4.9.2.tar.gz -O -J
         curl https://downloads.unidata.ucar.edu/netcdf-fortran/4.6.1/netcdf-fortran-4.6.1.tar.gz -O -J
-        ls -l
-        mkdir zlib
-        mkdir hdf5
         mkdir netcdf-c
         mkdir netcdf-f
-        tar -xzf zlib-1.3.1.tar.gz -C zlib --strip-components=1
-        tar -xzf hdf5-1.14.4-3.tar.gz -C hdf5 --strip-components=1
         tar -xzf netcdf-c-4.9.2.tar.gz -C netcdf-c --strip-components=1
         tar -xzf netcdf-fortran-4.6.1.tar.gz -C netcdf-f --strip-components=1
-        ls -l zlib
-        ls -l hdf5
-        ls -l netcdf-c
-        ls -l netcdf-f
+
+    - name: Restore hdf5 cache
+      id: hdf5-cache
+      uses: actions/cache/restore@v3
+      with:
+        path: hdf5
+        key: hdf5-${{ runner.os }}-${{ steps.get-date.outputs.date }}
 
     - name: Setup Cygwin
-      if: steps.petsc-cache.outputs.cache-hit != 'true'
+      if: steps.hdf5-cache.outputs.cache-hit != 'true'
       uses: egor-tensin/setup-cygwin@v4
       with:
-         packages: python3 make gcc-core gcc-g++ pkg-config m4 curl
+         packages: python3 make gcc-core gcc-g++ pkg-config m4 libcurl-devel
 #        packages: python3 make gcc-core gcc-g++ pkg-config zlib-devel
 
     - name: Hide Cygwin linker
-      if: steps.petsc-cache.outputs.cache-hit != 'true'
+      if: steps.hdf5-cache.outputs.cache-hit != 'true'
       shell: C:\tools\cygwin\bin\bash.exe --login --norc -eo pipefail -o igncr '{0}'
       run: mv /usr/bin/link.exe /usr/bin/link-cygwin.exe
 
+    - name: Download zlib
+      if: steps.hdf5-cache.outputs.cache-hit != 'true'
+      shell: bash
+      run: |
+        curl https://zlib.net/zlib-1.3.1.tar.gz -O -J
+        mkdir zlib
+        tar -xzf zlib-1.3.1.tar.gz -C zlib --strip-components=1
+
     - name: Compile zlib
-      if: steps.petsc-cache.outputs.cache-hit != 'true'
+      if: steps.hdf5-cache.outputs.cache-hit != 'true'
       shell: cmd
       run: |
         "%ONEAPI_ROOT%\setvars.bat" intel64 vs2022 && "C:\tools\cygwin\bin\bash.exe" --login --norc -eo pipefail -o igncr "%TEMP%\compile_zlib.sh"
 
+    - name: Download HDF5
+      if: steps.hdf5-cache.outputs.cache-hit != 'true'
+      shell: bash
+      run: |
+        curl https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.14/hdf5-1.14.4/src/hdf5-1.14.4-3.tar.gz -O -J
+        mkdir hdf5
+        tar -xzf hdf5-1.14.4-3.tar.gz -C hdf5 --strip-components=1
+
     - name: Compile hdf5
-      if: steps.petsc-cache.outputs.cache-hit != 'true'
+      if: steps.hdf5-cache.outputs.cache-hit != 'true'
       shell: cmd
       run: |
         "%ONEAPI_ROOT%\setvars.bat" intel64 vs2022 && "C:\tools\cygwin\bin\bash.exe" --login --norc -eo pipefail -o igncr "%TEMP%\compile_hdf5.sh"
 
+    - name: Save hdf5 cache
+      if: steps.hdf5-cache.outputs.cache-hit != 'true'
+      uses: actions/cache/save@v3
+      with:
+        path: hdf5
+        key: hdf5-${{ runner.os }}-${{ steps.get-date.outputs.date }}
+
     - name: Compile netcdf-c
       if: steps.petsc-cache.outputs.cache-hit != 'true'
       shell: cmd
@@ -105,8 +107,6 @@ runs:
       run: |
         "%ONEAPI_ROOT%\setvars.bat" intel64 vs2022 && "C:\tools\cygwin\bin\bash.exe" --login --norc -eo pipefail -o igncr "%TEMP%\compile_netcdff.sh"
 
-
-
 #    - name: Configure PETSc
 #      if: steps.petsc-cache.outputs.cache-hit != 'true'
 #      shell: cmd