Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/develop' into feat_prms_tests
Browse files Browse the repository at this point in the history
  • Loading branch information
jmccreight committed Oct 17, 2023
2 parents db8cb8d + 21520bc commit 71247d0
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/scripts/symlink_gfortran_mac.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# get full gfortran version string
# assumes installed via brew as by
# https://github.com/awvwgk/setup-fortran
# https://github.com/fortran-lang/setup-fortran
#
# sed not head for first line, avoid ruby broken pipe issues
# (https://stackoverflow.com/a/2845541/6514033)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ jobs:
if [[ "$MF6_REMOTE" != "$req_remote" ]]; then exit 1; fi
- name: Setup gfortran
uses: awvwgk/setup-fortran@main
uses: fortran-lang/setup-fortran@v1
with:
compiler: gcc
version: 11
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/ci_examples.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,11 @@ jobs:
- name: Checkout repo
uses: actions/[email protected]

- name: Install gfortran
uses: modflowpy/install-gfortran-action@v1
- name: Setup gfortran
uses: fortran-lang/setup-fortran@v1
with:
compiler: gcc
version: 11

- name: Download GIS files
working-directory: examples
Expand Down

0 comments on commit 71247d0

Please sign in to comment.