Sync fork (#8)

* feat: set FPM environment variables (#63)

* set FPM_FC/FPM_CC/FPM_CXX matching FC/CC/CXX
* consolidate env var assignment in setup script

* feat: support intel 2024.0 on linux and windows (#64)

* fix(mac/gcc): always create unversioned gcc/g++/gfortran links (#65)

* brew doesn't link gcc/g++ without version number like it does for gfortran
* this was causing default mac gcc/g++ to be discovered on PATH
* fix readme auto-update PR conditionals in reporting mode

* Update compatibility matrix (#66)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* ci: don't trigger when tags are pushed (#67)

* correct typo

* fix variable name

* pass cpp_name

* pass cpp_name

---------

Co-authored-by: wpbonelli <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Author: 3 people

.github/actions/test-cc/action.yml

@@ -14,6 +14,10 @@ runs:
     - name: Check compiler version
       shell: bash
       run: |
+        # check $CC == $FPM_CC
+        [[ "${{ env.CC }}" == "${{ env.FPM_CC }}" ]] && (echo "CC and FPM_CC match") || (echo "CC and FPM_CC don't match: ${{ env.CC }} != ${{ env.FPM_CC}}"; exit 1)
+
+        # check compiler version
         if ([ "$RUNNER_OS" == "Windows" ] && [[ "${{ inputs.compiler }}" =~ "intel" ]] && [[ "${{ inputs.compiler }}" != "nvidia-hpc" ]]); then
           # only last line of output captured by command substitution, write to temp file instead
           ${{ env.CC }} //QV > "$RUNNER_TEMP/${{ env.CC }}.ver" 2>&1

.github/actions/test-cxx/action.yml

@@ -14,6 +14,10 @@ runs:
     - name: Check compiler version
       shell: bash
       run: |
+        # check $CXX == $FPM_CXX
+        [[ "${{ env.CXX }}" == "${{ env.FPM_CXX }}" ]] && (echo "CXX and FPM_CXX match") || (echo "CXX and FPM_CXX don't match: ${{ env.CXX }} != ${{ env.FPM_CXX}}"; exit 1)
+
+        # check compiler version
         if ([ "$RUNNER_OS" == "Windows" ] && [[ "${{ matrix.toolchain.compiler }}" =~ "intel" ]] && [[ "${{ matrix.toolchain.compiler }}" != "nvidia-hpc" ]]); then
           # only last line of output captured by command substitution, write to temp file instead
           ${{ env.CXX }} //QV > "$RUNNER_TEMP/${{ env.CXX }}.ver" 2>&1

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

@@ -14,6 +14,10 @@ runs:
     - name: Check compiler version
       shell: bash
       run: |
+        # check $FC == $FPM_FC
+        [[ "${{ env.FC }}" == "${{ env.FPM_FC }}" ]] && (echo "FC and FPM_FC match") || (echo "FC and FPM_FC don't match: ${{ env.FC }} != ${{ env.FPM_FC}}"; exit 1)
+
+        # check compiler version
         if ([ "$RUNNER_OS" == "Windows" ] && [[ "${{ inputs.compiler }}" =~ "intel" ]] && [[ "${{ inputs.compiler }}" != "nvidia-hpc" ]]); then
           # only last line of output captured by command substitution, write to temp file instead
           ${{ env.FC }} //QV > "$RUNNER_TEMP/${{ env.FC }}.ver" 2>&1

.github/compat/compat.csv

@@ -1,11 +1,10 @@
-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,✓,✓,✓,✓,,✓,✓,,✓,,,,,✓,,✓,✓,✓,,,,,,,✓,,✓,✓,✓,✓,,,,,,,,
+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,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,2024.0,20.11,21.11,22.11,23.11,23.3,23.5,23.7,23.9
+runner,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+macos-12,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,,,,,,,,,,,,,,,,,,,,,
+macos-13,✓,✓,✓,✓,,,,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,,,,,,,,,,,,,,,,,,,,,
+macos-14,,✓,✓,✓,,,,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,,,,,,,,,,,,,,,,,,,,,
+ubuntu-20.04,✓,✓,,✓,✓,✓,✓,✓,✓,✓,,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓
+ubuntu-22.04,✓,✓,✓,✓,,,✓,✓,✓,✓,,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓,✓
+windows-2019,✓,✓,✓,✓,,✓,✓,,✓,,,,,✓,,✓,✓,✓,,,,,,,✓,,✓,✓,✓,✓,✓,,,,,,,,
+windows-2022,✓,✓,✓,✓,,✓,✓,,✓,,,,,✓,,✓,✓,✓,,,,,,,✓,,✓,✓,✓,✓,✓,,,,,,,,

.github/compat/long_compat.csv

@@ -94,6 +94,7 @@ ubuntu-20.04,intel,2022.2,✓
 ubuntu-20.04,intel,2023.0,✓
 ubuntu-20.04,intel,2023.1,✓
 ubuntu-20.04,intel,2023.2,✓
+ubuntu-20.04,intel,2024.0,✓
 ubuntu-20.04,nvidia-hpc,20.11,✓
 ubuntu-20.04,nvidia-hpc,20.7,
 ubuntu-20.04,nvidia-hpc,20.9,
@@ -137,6 +138,7 @@ ubuntu-22.04,intel,2022.2,✓
 ubuntu-22.04,intel,2023.0,✓
 ubuntu-22.04,intel,2023.1,✓
 ubuntu-22.04,intel,2023.2,✓
+ubuntu-22.04,intel,2024.0,✓
 ubuntu-22.04,nvidia-hpc,20.11,✓
 ubuntu-22.04,nvidia-hpc,20.7,
 ubuntu-22.04,nvidia-hpc,20.9,
@@ -180,6 +182,7 @@ windows-2019,intel,2022.2,✓
 windows-2019,intel,2023.0,✓
 windows-2019,intel,2023.1,✓
 windows-2019,intel,2023.2,✓
+windows-2019,intel,2024.0,✓
 windows-2022,gcc,10,✓
 windows-2022,gcc,11,✓
 windows-2022,gcc,12,✓
@@ -211,3 +214,4 @@ windows-2022,intel,2022.2,✓
 windows-2022,intel,2023.0,✓
 windows-2022,intel,2023.1,✓
 windows-2022,intel,2023.2,✓
+windows-2022,intel,2024.0,✓

.github/compat/matrix.yml

@@ -14,6 +14,7 @@ toolchain:
   - {compiler: gcc, version:  9}
   - {compiler: gcc, version:  8}
   - {compiler: gcc, version:  7}
+  - {compiler: intel, version: '2024.0'}
   - {compiler: intel, version: '2023.2'}
   - {compiler: intel, version: '2023.1'}
   - {compiler: intel, version: '2023.0'}

.github/workflows/test.yml

@@ -6,6 +6,8 @@ on:
   push:
     paths-ignore:
       - '**.md'
+    tags-ignore:
+      - v**
   pull_request:
     branches:
       - main
@@ -195,15 +197,15 @@ jobs:
           fi
 
       - name: Update README
-        if: ${{ steps.diff.outputs.diff == 'true' && github.event_name == 'push' }}
+        if: ${{ steps.diff.outputs.diff == 'true' }}
         run: python .github/compat/update_compat_table.py ".github/compat/compat.md" "README.md"
 
       - name: Print README diff
-        if: ${{ steps.diff.outputs.diff == 'true' && github.event_name == 'push' }}
+        if: ${{ steps.diff.outputs.diff == 'true' }}
         run: git diff README.md
 
       - name: Create pull request
-        if: ${{ steps.diff.outputs.diff == 'true' && github.event_name == 'push' }}
+        if: ${{ steps.diff.outputs.diff == 'true' }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |