diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2da647e08de..f7a1d090835 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -216,11 +216,11 @@ jobs: repository: MODFLOW-USGS/modflow6-examples path: modflow6-examples - - name: Setup ${{ env.FC }} ${{ env.FC_V }} + - name: Setup ${{ env.FC }} ${{ contains(fromJSON('["macos-14"]'), matrix.os) && 12 || env.FC_V }} uses: fortran-lang/setup-fortran@v1 with: compiler: gcc - version: ${{ env.FC_V }} + version: ${{ contains(fromJSON('["macos-14"]'), matrix.os) && 12 || env.FC_V }} - name: Setup pixi uses: prefix-dev/setup-pixi@v0.8.1 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 02ccefbf435..cdf97846eba 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -127,13 +127,13 @@ jobs: bash powershell - - name: Setup ${{ matrix.compiler }} ${{ matrix.version }} + - name: Setup ${{ matrix.compiler }} ${{ contains(fromJSON('["macos-14"]'), matrix.os) && 12 || matrix.version }} if: (!(runner.os == 'Windows' && matrix.parallel)) id: setup-fortran uses: fortran-lang/setup-fortran@v1 with: compiler: ${{ matrix.compiler }} - version: ${{ matrix.version }} + version: ${{ contains(fromJSON('["macos-14"]'), matrix.os) && 12 || matrix.version }} - name: Set version number id: set_version