Skip to content

feat: support gcc on macos-14 #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 22, 2024
Merged

feat: support gcc on macos-14 #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions .github/actions/test-fc/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,6 @@ runs:
working-directory: test
shell: bash
run: |
# macos-13/gfortran 7-9 compatibility workaround
args=""
if [ "$RUNNER_OS" == "macOS" ]; then
if [[ $(sw_vers -productVersion) == 13* ]] && \
[[ ${{ inputs.compiler }} == "gcc" ]] && \
[[ ${{ inputs.version }} =~ ^(7|8|9)$ ]]
then
args="-L/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib"
fi
fi

# hello world program
${{ env.FC }} $args -o hw hw.f90
output=$(./hw '2>&1')
Expand Down
21 changes: 11 additions & 10 deletions .github/compat/compat.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
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
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
runner,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
macos-11,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,,,,,,,,,,,,,,,,,,,,,
macos-12,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,,,,,,,,,,,,,,,,,,,,,
macos-13,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,,,,,,,,,,,,,,,,,,,,,
ubuntu-20.04,✓,✓,,✓,✓,✓,✓,✓,✓,✓,,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓
ubuntu-22.04,✓,✓,✓,✓,,,✓,✓,✓,✓,,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓
windows-2019,✓,✓,✓,✓,,✓,✓,,✓,,,,,✓,,✓,✓,✓,,,,,,,✓,,✓,✓,✓,✓,,,,,,,,,
windows-2022,✓,✓,✓,✓,,✓,✓,,✓,,,,,✓,,✓,✓,✓,,,,,,,✓,,✓,✓,✓,✓,,,,,,,,,
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
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
runner,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
macos-11,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,,,,,,,,,,,,,,,,,,,,
macos-12,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,,,,,,,,,,,,,,,,,,,,
macos-13,✓,✓,✓,✓,,,,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,,,,,,,,,,,,,,,,,,,,
macos-14,,✓,✓,✓,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
ubuntu-20.04,✓,✓,,✓,✓,✓,✓,✓,✓,✓,,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓
ubuntu-22.04,✓,✓,✓,✓,,,✓,✓,✓,✓,,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓
windows-2019,✓,✓,✓,✓,,✓,✓,,✓,,,,,✓,,✓,✓,✓,,,,,,,✓,,✓,✓,✓,✓,,,,,,,,
windows-2022,✓,✓,✓,✓,,✓,✓,,✓,,,,,✓,,✓,✓,✓,,,,,,,✓,,✓,✓,✓,✓,,,,,,,,
13 changes: 8 additions & 5 deletions .github/compat/long_compat.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ macos-13,gcc,11,✓
macos-13,gcc,12,✓
macos-13,gcc,13,✓
macos-13,gcc,6,
macos-13,gcc,7,✓
macos-13,gcc,8,✓
macos-13,gcc,9,✓
macos-13,gcc,7,
macos-13,gcc,8,
macos-13,gcc,9,
macos-13,intel-classic,2021.1.2,
macos-13,intel-classic,2021.1,✓
macos-13,intel-classic,2021.10,✓
Expand All @@ -67,6 +67,9 @@ ubuntu-20.04,gcc,6,
ubuntu-20.04,gcc,7,✓
ubuntu-20.04,gcc,8,✓
ubuntu-20.04,gcc,9,✓
macos-14,gcc,11,✓
macos-14,gcc,12,✓
macos-14,gcc,13,✓
ubuntu-20.04,intel-classic,2021.1.2,✓
ubuntu-20.04,intel-classic,2021.1,✓
ubuntu-20.04,intel-classic,2021.10,✓
Expand Down Expand Up @@ -95,7 +98,7 @@ ubuntu-20.04,nvidia-hpc,20.7,
ubuntu-20.04,nvidia-hpc,20.9,
ubuntu-20.04,nvidia-hpc,21.1,
ubuntu-20.04,nvidia-hpc,21.11,✓
ubuntu-20.04,nvidia-hpc,22.1,✓
ubuntu-20.04,nvidia-hpc,22.1,
ubuntu-20.04,nvidia-hpc,22.11,✓
ubuntu-20.04,nvidia-hpc,23.11,✓
ubuntu-20.04,nvidia-hpc,23.3,✓
Expand Down Expand Up @@ -138,7 +141,7 @@ ubuntu-22.04,nvidia-hpc,20.7,
ubuntu-22.04,nvidia-hpc,20.9,
ubuntu-22.04,nvidia-hpc,21.1,
ubuntu-22.04,nvidia-hpc,21.11,✓
ubuntu-22.04,nvidia-hpc,22.1,✓
ubuntu-22.04,nvidia-hpc,22.1,
ubuntu-22.04,nvidia-hpc,22.11,✓
ubuntu-22.04,nvidia-hpc,23.11,✓
ubuntu-22.04,nvidia-hpc,23.3,✓
Expand Down
16 changes: 13 additions & 3 deletions .github/compat/matrix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
os:
- ubuntu-22.04
- ubuntu-20.04
- macos-14
- macos-13
- macos-12
- macos-11
- windows-2022
- windows-2019
toolchain:
Expand All @@ -14,7 +14,6 @@ toolchain:
- {compiler: gcc, version: 9}
- {compiler: gcc, version: 8}
- {compiler: gcc, version: 7}
- {compiler: gcc, version: 6}
- {compiler: intel, version: '2023.2'}
- {compiler: intel, version: '2023.1'}
- {compiler: intel, version: '2023.0'}
Expand Down Expand Up @@ -63,13 +62,17 @@ toolchain:
- {compiler: nvidia-hpc, version: '20.7'}
exclude:
# ifx not available for mac
- os: macos-14
toolchain: {compiler: intel}
- os: macos-13
toolchain: {compiler: intel}
- os: macos-12
toolchain: {compiler: intel}
- os: macos-11
toolchain: {compiler: intel}
# nvidia-hpc not available for mac
- os: macos-14
toolchain: {compiler: nvidia-hpc}
- os: macos-13
toolchain: {compiler: nvidia-hpc}
- os: macos-12
Expand All @@ -80,4 +83,11 @@ exclude:
- os: windows-2022
toolchain: {compiler: nvidia-hpc}
- os: windows-2019
toolchain: {compiler: nvidia-hpc}
toolchain: {compiler: nvidia-hpc}
# gcc<=10 not available for ARM mac
- os: macos-14
toolchain: {compiler: gcc, version: 8}
- os: macos-14
toolchain: {compiler: gcc, version: 9}
- os: macos-14
toolchain: {compiler: gcc, version: 10}
4 changes: 4 additions & 0 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ jobs:
- name: Set mode
id: mode
run: |
trigger=${{ github.event_name }}
if [[ "$trigger" == "schedule" ]] || [[ "$trigger" == "workflow_dispatch" ]]; then
echo "mode=report" >> "$GITHUB_OUTPUT"
else
Expand Down Expand Up @@ -72,6 +73,9 @@ jobs:
compiler: ${{ matrix.toolchain.compiler }}
version: ${{ matrix.toolchain.version }}

# - name: Debug with tmate
# uses: mxschmitt/action-tmate@v3

- name: Test Fortran compiler
if: steps.setup-fortran.outcome == 'success'
uses: ./.github/actions/test-fc
Expand Down
Loading