switch to fortran-lang/setup-fortran@v1

MODFLOW-USGS · Oct 20, 2023 · d312409 · d312409
1 parent df3e7f2
commit d312409
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 15 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,13 +14,15 @@ on:
         required: true
         type: string
       compiler_toolchain:
-        description: 'Compiler toolchain to use. See awvwgk/setup-fortran for supported options.'
-        required: true
+        description: 'Compiler toolchain to use. For supported options see https://github.com/MODFLOW-USGS/modflow6/blob/develop/DEVELOPER.md#compiler-compatibility.'
+        required: false
         type: string
+        default: 'intel-classic'
       compiler_version:
-        description: 'Compiler version to use. See awvwgk/setup-fortran for supported versions of each toolchain.'
-        required: true
+        description: 'Compiler version to use. For supported options see https://github.com/MODFLOW-USGS/modflow6/blob/develop/DEVELOPER.md#compiler-compatibility.'
+        required: false
         type: string
+        default: '2021.7'
       developmode:
         description: 'Build binaries in develop mode. If false, IDEVELOPMODE is set to 0.'
         required: false
@@ -93,7 +95,7 @@ jobs:
             powershell
 
       - name: Setup ${{ inputs.compiler_toolchain }} ${{ inputs.compiler_version }}
-        uses: awvwgk/setup-fortran@main
+        uses: fortran-lang/setup-fortran@v1
         with:
           compiler: ${{ inputs.compiler_toolchain }}
           version: ${{ inputs.compiler_version }}
@@ -290,7 +292,7 @@ jobs:
           cache-environment: true
 
       - name: Setup ${{ inputs.compiler_toolchain }} ${{ inputs.compiler_version }}
-        uses: awvwgk/setup-fortran@main
+        uses: fortran-lang/setup-fortran@v1
         with:
           compiler: ${{ inputs.compiler_toolchain }}
           version: ${{ inputs.compiler_version }}
@@ -444,7 +446,7 @@ jobs:
             powershell
 
       - name: Setup ${{ inputs.compiler_toolchain }} ${{ inputs.compiler_version }}
-        uses: awvwgk/setup-fortran@main
+        uses: fortran-lang/setup-fortran@v1
         with:
           compiler: ${{ inputs.compiler_toolchain }}
           version: ${{ inputs.compiler_version }}

diff --git a/.github/workflows/release_dispatch.yml b/.github/workflows/release_dispatch.yml
@@ -25,15 +25,15 @@ on:
         required: true
         type: string
       compiler_toolchain:
-        description: 'Compiler toolchain to use. Options are gcc, intel, or intel-classic, as supported by awvwgk/setup-fortran.'
-        required: true
+        description: 'Compiler toolchain to use. For supported options see https://github.com/MODFLOW-USGS/modflow6/blob/develop/DEVELOPER.md#compiler-compatibility.'
+        required: false
         type: string
-        default: intel-classic
+        default: 'intel-classic'
       compiler_version:
-        description: 'Compiler version to use. See awvwgk/setup-fortran for supported versions of each toolchain.'
-        required: true
+        description: 'Compiler version to use. For supported options see https://github.com/MODFLOW-USGS/modflow6/blob/develop/DEVELOPER.md#compiler-compatibility.'
+        required: false
         type: string
-        default: 2021.7.0
+        default: '2021.7'
       commit_version:
         description: 'Commit version numbers back to the develop branch. Not considered if reset is false.'
         required: false
@@ -46,7 +46,7 @@ on:
         default: false
       run_tests:
         description: 'Run tests after building binaries.'
-        required: true
+        required: false
         type: boolean
         default: true
       version:
@@ -100,7 +100,7 @@ jobs:
           elif [[ ("${{ github.event_name }}" == "push") && ("${{ github.ref_name }}" != "master") ]]; then
             # if release was triggered by pushing a release branch, use the default toolchain and version
             compiler_toolchain="intel-classic"
-            compiler_version="2021.7.0"
+            compiler_version="2021.7"
             echo "using default compiler toolchain $compiler_toolchain version $compiler_version"
           else
             # otherwise exit with an error