diff --git a/.github/actions/build-extended-win/action.yml b/.github/actions/build-extended-win/action.yml index b6e1592442a..97576f8d95d 100644 --- 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 index 698a150a25c..14474bd8f36 100644 --- 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