From fd357db00de62c7de0a55ef922c910a3010a9236 Mon Sep 17 00:00:00 2001 From: wpbonelli Date: Sat, 1 Feb 2025 08:56:42 -0500 Subject: [PATCH 1/2] chore: support gcc14 (mac/linux), bump default intel version --- .github/compat/matrix.yml | 15 +++------------ README.md | 2 +- action.yml | 2 +- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/.github/compat/matrix.yml b/.github/compat/matrix.yml index 3838714..da79164 100644 --- a/.github/compat/matrix.yml +++ b/.github/compat/matrix.yml @@ -1,16 +1,14 @@ os: + - ubuntu-24.04 - ubuntu-22.04 - - ubuntu-20.04 - macos-14 - macos-13 - windows-2022 - windows-2019 toolchain: + - {compiler: gcc, version: 14} - {compiler: gcc, version: 13} - {compiler: gcc, version: 12} - - {compiler: gcc, version: 11} - - {compiler: gcc, version: 10} - - {compiler: gcc, version: 9} - {compiler: intel, version: '2025.0'} - {compiler: intel, version: '2024.1'} - {compiler: intel, version: '2024.0'} @@ -89,11 +87,4 @@ exclude: - os: windows-2022 toolchain: {compiler: nvidia-hpc} - os: windows-2019 - 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} + toolchain: {compiler: nvidia-hpc} \ No newline at end of file diff --git a/README.md b/README.md index 07f0752..99d2393 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ jobs: os: [ubuntu-latest, macos-latest, windows-latest] toolchain: - {compiler: gcc, version: 13} - - {compiler: intel, version: '2023.2'} + - {compiler: intel, version: '2025.0'} - {compiler: intel-classic, version: '2021.10'} - {compiler: nvidia-hpc, version: '23.11'} include: diff --git a/action.yml b/action.yml index 5f2f627..03d5cc7 100644 --- a/action.yml +++ b/action.yml @@ -90,7 +90,7 @@ runs: install_intel $platform true ;; intel) - version=${VERSION:-2024.1} + version=${VERSION:-2025.0} install_intel $platform false ;; nvidia-hpc) From 02eb732c857b1953fc4c17293c0dc7339bf63a2e Mon Sep 17 00:00:00 2001 From: wpbonelli Date: Sat, 1 Feb 2025 09:28:32 -0500 Subject: [PATCH 2/2] upload/download-artifact@v4 --- .github/workflows/test.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7f65195..4648aa1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -114,9 +114,9 @@ jobs: - name: Upload compatibility report if: needs.options.outputs.mode == 'report' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: compat + name: compat-${{ matrix.os }}-${{ matrix.toolchain.compiler }}-${{ matrix.toolchain.version }} path: compat/*.csv compat: @@ -143,10 +143,11 @@ jobs: run: pip install -r requirements.txt - name: Download reports - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: - name: compat + pattern: compat-* path: compat + merge-multiple: true - name: Concatenate reports run: | @@ -160,7 +161,7 @@ jobs: cat compat.md - name: Upload artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: compat path: |