Skip to content

Commit

Permalink
fix(ci): try cmd, curl is apparently not guaranteed in bash shell (MO…
Browse files Browse the repository at this point in the history
…DFLOW-USGS#2086)

* curl is not guaranteed in bash shell

* - reversing order to avoid cygwin bash from petsc
  • Loading branch information
mjr-deltares authored Dec 3, 2024
1 parent ec5b7bf commit 099d735
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .github/actions/build-extended-win/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
3 changes: 1 addition & 2 deletions .github/actions/build-netcdf-win/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 099d735

Please sign in to comment.