Skip to content

Commit 1932b5c

Browse files
committed
switch to fortran-lang/setup-fortran@v1
1 parent df3e7f2 commit 1932b5c

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

.github/workflows/release.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,15 @@ on:
1414
required: true
1515
type: string
1616
compiler_toolchain:
17-
description: 'Compiler toolchain to use. See awvwgk/setup-fortran for supported options.'
18-
required: true
17+
description: 'Compiler toolchain to use. For supported options see https://github.com/MODFLOW-USGS/modflow6/blob/develop/DEVELOPER.md#compiler-compatibility.'
18+
required: false
1919
type: string
20+
default: 'intel-classic'
2021
compiler_version:
21-
description: 'Compiler version to use. See awvwgk/setup-fortran for supported versions of each toolchain.'
22-
required: true
22+
description: 'Compiler version to use. For supported options see https://github.com/MODFLOW-USGS/modflow6/blob/develop/DEVELOPER.md#compiler-compatibility.'
23+
required: false
2324
type: string
25+
default: '2021.7'
2426
developmode:
2527
description: 'Build binaries in develop mode. If false, IDEVELOPMODE is set to 0.'
2628
required: false
@@ -93,7 +95,7 @@ jobs:
9395
powershell
9496
9597
- name: Setup ${{ inputs.compiler_toolchain }} ${{ inputs.compiler_version }}
96-
uses: awvwgk/setup-fortran@main
98+
uses: fortran-lang/setup-fortran@v1
9799
with:
98100
compiler: ${{ inputs.compiler_toolchain }}
99101
version: ${{ inputs.compiler_version }}
@@ -290,7 +292,7 @@ jobs:
290292
cache-environment: true
291293

292294
- name: Setup ${{ inputs.compiler_toolchain }} ${{ inputs.compiler_version }}
293-
uses: awvwgk/setup-fortran@main
295+
uses: fortran-lang/setup-fortran@v1
294296
with:
295297
compiler: ${{ inputs.compiler_toolchain }}
296298
version: ${{ inputs.compiler_version }}
@@ -444,7 +446,7 @@ jobs:
444446
powershell
445447
446448
- name: Setup ${{ inputs.compiler_toolchain }} ${{ inputs.compiler_version }}
447-
uses: awvwgk/setup-fortran@main
449+
uses: fortran-lang/setup-fortran@v1
448450
with:
449451
compiler: ${{ inputs.compiler_toolchain }}
450452
version: ${{ inputs.compiler_version }}

.github/workflows/release_dispatch.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ on:
2525
required: true
2626
type: string
2727
compiler_toolchain:
28-
description: 'Compiler toolchain to use. Options are gcc, intel, or intel-classic, as supported by awvwgk/setup-fortran.'
28+
description: 'Compiler toolchain to use. For supported options see https://github.com/MODFLOW-USGS/modflow6/blob/develop/DEVELOPER.md#compiler-compatibility.'
2929
required: true
3030
type: string
31-
default: intel-classic
31+
default: 'intel-classic'
3232
compiler_version:
33-
description: 'Compiler version to use. See awvwgk/setup-fortran for supported versions of each toolchain.'
33+
description: 'Compiler version to use. For supported options see https://github.com/MODFLOW-USGS/modflow6/blob/develop/DEVELOPER.md#compiler-compatibility.'
3434
required: true
3535
type: string
36-
default: 2021.7.0
36+
default: '2021.7'
3737
commit_version:
3838
description: 'Commit version numbers back to the develop branch. Not considered if reset is false.'
3939
required: false
@@ -100,7 +100,7 @@ jobs:
100100
elif [[ ("${{ github.event_name }}" == "push") && ("${{ github.ref_name }}" != "master") ]]; then
101101
# if release was triggered by pushing a release branch, use the default toolchain and version
102102
compiler_toolchain="intel-classic"
103-
compiler_version="2021.7.0"
103+
compiler_version="2021.7"
104104
echo "using default compiler toolchain $compiler_toolchain version $compiler_version"
105105
else
106106
# otherwise exit with an error

0 commit comments

Comments
 (0)