From 7f498fcb979c4d2ad0b345921ce5936c08727162 Mon Sep 17 00:00:00 2001 From: Wes Bonelli Date: Fri, 13 Oct 2023 12:05:29 -0400 Subject: [PATCH 1/2] ci: swap setup-fortran for install-gfortran-action --- .github/workflows/ci.yaml | 4 +--- .github/workflows/ci_examples.yaml | 7 +++++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 230d3f94..8c84396b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -147,7 +147,7 @@ jobs: if [[ "$MF6_REMOTE" != "$req_remote" ]]; then exit 1; fi - name: Setup gfortran - uses: awvwgk/setup-fortran@main + uses: awvwgk/setup-fortran@v1 with: compiler: gcc version: 11 @@ -194,8 +194,6 @@ jobs: pytest -vv -n=auto --durations=0 convert_prms_output_to_nc.py --domain=hru_1 pytest -vv -n=auto --durations=0 remove_prms_csvs.py - - - name: hru_1 - list netcdf input files working-directory: test_data run: | diff --git a/.github/workflows/ci_examples.yaml b/.github/workflows/ci_examples.yaml index 150d3ada..b99d696d 100644 --- a/.github/workflows/ci_examples.yaml +++ b/.github/workflows/ci_examples.yaml @@ -31,8 +31,11 @@ jobs: - name: Checkout repo uses: actions/checkout@v2.4.0 - - name: Install gfortran - uses: modflowpy/install-gfortran-action@v1 + - name: Setup gfortran + uses: awvwgk/setup-fortran@v1 + with: + compiler: gcc + version: 11 - name: Download GIS files working-directory: examples From 461686fa68f5251c46a8d1842ed00bb7cc9d05fb Mon Sep 17 00:00:00 2001 From: Wes Bonelli Date: Fri, 13 Oct 2023 15:08:00 -0400 Subject: [PATCH 2/2] ci: fix awvwgk/setup-fortran -> fortran-lang/setup-fortran --- .github/scripts/symlink_gfortran_mac.sh | 2 +- .github/workflows/ci.yaml | 2 +- .github/workflows/ci_examples.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/scripts/symlink_gfortran_mac.sh b/.github/scripts/symlink_gfortran_mac.sh index bf5933d8..df8a9556 100755 --- a/.github/scripts/symlink_gfortran_mac.sh +++ b/.github/scripts/symlink_gfortran_mac.sh @@ -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) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8c84396b..a885a8bc 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -147,7 +147,7 @@ jobs: if [[ "$MF6_REMOTE" != "$req_remote" ]]; then exit 1; fi - name: Setup gfortran - uses: awvwgk/setup-fortran@v1 + uses: fortran-lang/setup-fortran@v1 with: compiler: gcc version: 11 diff --git a/.github/workflows/ci_examples.yaml b/.github/workflows/ci_examples.yaml index b99d696d..8f26a1f4 100644 --- a/.github/workflows/ci_examples.yaml +++ b/.github/workflows/ci_examples.yaml @@ -32,7 +32,7 @@ jobs: uses: actions/checkout@v2.4.0 - name: Setup gfortran - uses: awvwgk/setup-fortran@v1 + uses: fortran-lang/setup-fortran@v1 with: compiler: gcc version: 11