fix(ci): try cmd, curl is apparently not guaranteed in bash shell (#2086

) * curl is not guaranteed in bash shell * - reversing order to avoid cygwin bash from petsc
MODFLOW-USGS · Dec 3, 2024 · 099d735 · 099d735
1 parent ec5b7bf
commit 099d735
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.github/actions/build-extended-win/action.yml b/.github/actions/build-extended-win/action.yml
@@ -3,13 +3,13 @@ description: Build Extended MODFLOW 6 on Windows
 runs:
   using: "composite"
   steps:
+    # first NetCDF, PETSc cygwin installation forces a different bash shell upon us...
+    - name: Setup NetCDF
+      uses: ./modflow6/.github/actions/build-netcdf-win
 
     - name: Setup PETSc
       uses: ./modflow6/.github/actions/build-petsc-win
 
-    - name: Setup NetCDF
-      uses: ./modflow6/.github/actions/build-netcdf-win
-
     - name: Build modflow6
       shell: cmd
       run: |

diff --git a/.github/actions/build-netcdf-win/action.yml b/.github/actions/build-netcdf-win/action.yml
@@ -22,7 +22,6 @@ runs:
       run: |
         mkdir -p netcdf/netCDF4.9.2-NC4-64
         cd netcdf/netCDF4.9.2-NC4-64
-        which curl
         curl https://downloads.unidata.ucar.edu/netcdf-c/4.9.2/netCDF4.9.2-NC4-64.exe -O -J
         7z x netCDF4.9.2-NC4-64.exe -aou
 
@@ -31,7 +30,7 @@ runs:
       run: |
         mkdir -p netcdf/netcdf-fortran-4.6.1/build
         cd netcdf/netcdf-fortran-4.6.1
-        curl -L -o netcdf-fortran-4.6.1.zip "https://downloads.unidata.ucar.edu/netcdf-fortran/4.6.1/netcdf-fortran-4.6.1.zip"
+        curl https://downloads.unidata.ucar.edu/netcdf-fortran/4.6.1/netcdf-fortran-4.6.1.zip -O -J
         unzip netcdf-fortran-4.6.1.zip
 
     - name: Setup oneAPI