Skip to content

Commit 56010a6

Browse files
wpbonelliwpbonelli
authored
feat: support gcc on macos-14 (#60)
* macos-11 is deprecated, stop testing and drop support * macos-13/gcc7-9 workaround no longer works, drop support * mark macos-12/gcc 13 and macos-12/ifort 2021.7 supported * installing nvidia 22.1 maxes out runner storage, drop support
1 parent 5875bb2 commit 56010a6

File tree

7 files changed

+70
-44
lines changed

7 files changed

+70
-44
lines changed

‎.github/actions/test-fc/action.yml

-11
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,6 @@ runs:
3333
working-directory: test
3434
shell: bash
3535
run: |
36-
# macos-13/gfortran 7-9 compatibility workaround
37-
args=""
38-
if [ "$RUNNER_OS" == "macOS" ]; then
39-
if [[ $(sw_vers -productVersion) == 13* ]] && \
40-
[[ ${{ inputs.compiler }} == "gcc" ]] && \
41-
[[ ${{ inputs.version }} =~ ^(7|8|9)$ ]]
42-
then
43-
args="-L/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib"
44-
fi
45-
fi
46-
4736
# hello world program
4837
${{ env.FC }} $args -o hw hw.f90
4938
output=$(./hw '2>&1')

‎.github/compat/compat.csv

+11-10
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
compiler,gcc,gcc,gcc,gcc,gcc,gcc,gcc,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel,intel,intel,intel,intel,intel,intel,intel,intel,intel,intel,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc
2-
version,10,11,12,13,7,8,9,2021.1,2021.10,2021.2,2021.3,2021.4,2021.5,2021.6,2021.7.1,2021.7,2021.8,2021.9,2021.1.2,2021.1.2,2021.1,2021.2,2021.4,2022.0,2022.1,2022.2.1,2022.2,2023.0,2023.1,2023.2,20.11,21.11,22.1,22.11,23.11,23.3,23.5,23.7,23.9
3-
runner,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
4-
macos-11,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,,,,,,,,,,,,,,,,,,,,,
5-
macos-12,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,,,,,,,,,,,,,,,,,,,,,
6-
macos-13,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,,,,,,,,,,,,,,,,,,,,,
7-
ubuntu-20.04,✓,✓,,✓,✓,✓,✓,✓,✓,✓,,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓
8-
ubuntu-22.04,✓,✓,✓,✓,,,✓,✓,✓,✓,,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓
9-
windows-2019,✓,✓,✓,✓,,✓,✓,,✓,,,,,✓,,✓,✓,✓,,,,,,,✓,,✓,✓,✓,✓,,,,,,,,,
10-
windows-2022,✓,✓,✓,✓,,✓,✓,,✓,,,,,✓,,✓,✓,✓,,,,,,,✓,,✓,✓,✓,✓,,,,,,,,,
1+
compiler,gcc,gcc,gcc,gcc,gcc,gcc,gcc,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel-classic,intel,intel,intel,intel,intel,intel,intel,intel,intel,intel,intel,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc,nvidia-hpc
2+
version,10,11,12,13,7,8,9,2021.1,2021.10,2021.2,2021.3,2021.4,2021.5,2021.6,2021.7.1,2021.7,2021.8,2021.9,2021.1.2,2021.1.2,2021.1,2021.2,2021.4,2022.0,2022.1,2022.2.1,2022.2,2023.0,2023.1,2023.2,20.11,21.11,22.11,23.11,23.3,23.5,23.7,23.9
3+
runner,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
4+
macos-11,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,,,,,,,,,,,,,,,,,,,,
5+
macos-12,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,,,,,,,,,,,,,,,,,,,,
6+
macos-13,✓,✓,✓,✓,,,,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,,,,,,,,,,,,,,,,,,,,
7+
macos-14,,✓,✓,✓,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
8+
ubuntu-20.04,✓,✓,,✓,✓,✓,✓,✓,✓,✓,,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓
9+
ubuntu-22.04,✓,✓,✓,✓,,,✓,✓,✓,✓,,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓
10+
windows-2019,✓,✓,✓,✓,,✓,✓,,✓,,,,,✓,,✓,✓,✓,,,,,,,✓,,✓,✓,✓,✓,,,,,,,,
11+
windows-2022,✓,✓,✓,✓,,✓,✓,,✓,,,,,✓,,✓,✓,✓,,,,,,,✓,,✓,✓,✓,✓,,,,,,,,

‎.github/compat/long_compat.csv

+8-5
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ macos-13,gcc,11,✓
4444
macos-13,gcc,12,✓
4545
macos-13,gcc,13,✓
4646
macos-13,gcc,6,
47-
macos-13,gcc,7,✓
48-
macos-13,gcc,8,✓
49-
macos-13,gcc,9,✓
47+
macos-13,gcc,7,
48+
macos-13,gcc,8,
49+
macos-13,gcc,9,
5050
macos-13,intel-classic,2021.1.2,
5151
macos-13,intel-classic,2021.1,✓
5252
macos-13,intel-classic,2021.10,✓
@@ -67,6 +67,9 @@ ubuntu-20.04,gcc,6,
6767
ubuntu-20.04,gcc,7,✓
6868
ubuntu-20.04,gcc,8,✓
6969
ubuntu-20.04,gcc,9,✓
70+
macos-14,gcc,11,✓
71+
macos-14,gcc,12,✓
72+
macos-14,gcc,13,✓
7073
ubuntu-20.04,intel-classic,2021.1.2,✓
7174
ubuntu-20.04,intel-classic,2021.1,✓
7275
ubuntu-20.04,intel-classic,2021.10,✓
@@ -95,7 +98,7 @@ ubuntu-20.04,nvidia-hpc,20.7,
9598
ubuntu-20.04,nvidia-hpc,20.9,
9699
ubuntu-20.04,nvidia-hpc,21.1,
97100
ubuntu-20.04,nvidia-hpc,21.11,✓
98-
ubuntu-20.04,nvidia-hpc,22.1,✓
101+
ubuntu-20.04,nvidia-hpc,22.1,
99102
ubuntu-20.04,nvidia-hpc,22.11,✓
100103
ubuntu-20.04,nvidia-hpc,23.11,✓
101104
ubuntu-20.04,nvidia-hpc,23.3,✓
@@ -138,7 +141,7 @@ ubuntu-22.04,nvidia-hpc,20.7,
138141
ubuntu-22.04,nvidia-hpc,20.9,
139142
ubuntu-22.04,nvidia-hpc,21.1,
140143
ubuntu-22.04,nvidia-hpc,21.11,✓
141-
ubuntu-22.04,nvidia-hpc,22.1,✓
144+
ubuntu-22.04,nvidia-hpc,22.1,
142145
ubuntu-22.04,nvidia-hpc,22.11,✓
143146
ubuntu-22.04,nvidia-hpc,23.11,✓
144147
ubuntu-22.04,nvidia-hpc,23.3,✓

‎.github/compat/matrix.yml

+13-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
os:
22
- ubuntu-22.04
33
- ubuntu-20.04
4+
- macos-14
45
- macos-13
56
- macos-12
6-
- macos-11
77
- windows-2022
88
- windows-2019
99
toolchain:
@@ -14,7 +14,6 @@ toolchain:
1414
- {compiler: gcc, version: 9}
1515
- {compiler: gcc, version: 8}
1616
- {compiler: gcc, version: 7}
17-
- {compiler: gcc, version: 6}
1817
- {compiler: intel, version: '2023.2'}
1918
- {compiler: intel, version: '2023.1'}
2019
- {compiler: intel, version: '2023.0'}
@@ -63,13 +62,17 @@ toolchain:
6362
- {compiler: nvidia-hpc, version: '20.7'}
6463
exclude:
6564
# ifx not available for mac
65+
- os: macos-14
66+
toolchain: {compiler: intel}
6667
- os: macos-13
6768
toolchain: {compiler: intel}
6869
- os: macos-12
6970
toolchain: {compiler: intel}
7071
- os: macos-11
7172
toolchain: {compiler: intel}
7273
# nvidia-hpc not available for mac
74+
- os: macos-14
75+
toolchain: {compiler: nvidia-hpc}
7376
- os: macos-13
7477
toolchain: {compiler: nvidia-hpc}
7578
- os: macos-12
@@ -80,4 +83,11 @@ exclude:
8083
- os: windows-2022
8184
toolchain: {compiler: nvidia-hpc}
8285
- os: windows-2019
83-
toolchain: {compiler: nvidia-hpc}
86+
toolchain: {compiler: nvidia-hpc}
87+
# gcc<=10 not available for ARM mac
88+
- os: macos-14
89+
toolchain: {compiler: gcc, version: 8}
90+
- os: macos-14
91+
toolchain: {compiler: gcc, version: 9}
92+
- os: macos-14
93+
toolchain: {compiler: gcc, version: 10}

‎.github/workflows/test.yml

+4
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ jobs:
2929
- name: Set mode
3030
id: mode
3131
run: |
32+
trigger=${{ github.event_name }}
3233
if [[ "$trigger" == "schedule" ]] || [[ "$trigger" == "workflow_dispatch" ]]; then
3334
echo "mode=report" >> "$GITHUB_OUTPUT"
3435
else
@@ -72,6 +73,9 @@ jobs:
7273
compiler: ${{ matrix.toolchain.compiler }}
7374
version: ${{ matrix.toolchain.version }}
7475

76+
# - name: Debug with tmate
77+
# uses: mxschmitt/action-tmate@v3
78+
7579
- name: Test Fortran compiler
7680
if: steps.setup-fortran.outcome == 'success'
7781
uses: ./.github/actions/test-fc

0 commit comments

Comments
 (0)