From 85da02c48dd4bd9aab490292b1f7c2e26fb4463e Mon Sep 17 00:00:00 2001 From: Federico Perini Date: Mon, 9 Dec 2024 08:47:04 -0600 Subject: [PATCH 1/5] deprecate macos-12 --- .github/workflows/CI.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 6988259d3..bdc2f093a 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-12] + os: [ubuntu-latest, macos-13] toolchain: - {compiler: gcc, version: 10} - {compiler: gcc, version: 11} @@ -34,9 +34,9 @@ jobs: toolchain: - {compiler: gcc, version: 10} exclude: - - os: macos-12 + - os: macos-13 toolchain: {compiler: intel, version: '2024.1'} - - os: macos-12 + - os: macos-13 toolchain: {compiler: gcc, version: 13} env: BUILD_DIR: ${{ matrix.build == 'cmake' && 'build' || '.' }} From 7d2d4761b16df8cb28ffa86426a02f4826297550 Mon Sep 17 00:00:00 2001 From: Federico Perini Date: Mon, 9 Dec 2024 18:02:25 +0100 Subject: [PATCH 2/5] remove intel-classic from macOS 13, use ifx --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index bdc2f093a..87cd595a2 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -35,7 +35,7 @@ jobs: - {compiler: gcc, version: 10} exclude: - os: macos-13 - toolchain: {compiler: intel, version: '2024.1'} + toolchain: {compiler: intel-classic, version: '2024.1'} - os: macos-13 toolchain: {compiler: gcc, version: 13} env: From 151f9a34dcaaa0c1a76b6866f1bb1780e32aaa16 Mon Sep 17 00:00:00 2001 From: Federico Perini Date: Mon, 9 Dec 2024 18:38:34 +0100 Subject: [PATCH 3/5] remove intel from macos altogether --- .github/workflows/CI.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 87cd595a2..b426297ef 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -35,9 +35,9 @@ jobs: - {compiler: gcc, version: 10} exclude: - os: macos-13 - toolchain: {compiler: intel-classic, version: '2024.1'} + toolchain: {compiler: intel-classic, version: '2021.9'} - os: macos-13 - toolchain: {compiler: gcc, version: 13} + toolchain: {compiler: intel, version: '2024.1'} env: BUILD_DIR: ${{ matrix.build == 'cmake' && 'build' || '.' }} From 555548ace115604cbf4891eae7466a2e64b7b5d5 Mon Sep 17 00:00:00 2001 From: Federico Perini Date: Mon, 9 Dec 2024 19:03:29 +0100 Subject: [PATCH 4/5] gcc-13 not supported on macos --- .github/workflows/CI.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index b426297ef..2a1d5da5c 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -38,6 +38,8 @@ jobs: toolchain: {compiler: intel-classic, version: '2021.9'} - os: macos-13 toolchain: {compiler: intel, version: '2024.1'} + - os: macos-13 + toolchain: {compiler: gcc, version: 13} env: BUILD_DIR: ${{ matrix.build == 'cmake' && 'build' || '.' }} From fa89c876ce76164060222535480e986eb979abec Mon Sep 17 00:00:00 2001 From: Federico Perini Date: Tue, 10 Dec 2024 08:13:27 +0100 Subject: [PATCH 5/5] Update .github/workflows/CI.yml Co-authored-by: Jeremie Vandenplas --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 2a1d5da5c..707916ea2 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -39,7 +39,7 @@ jobs: - os: macos-13 toolchain: {compiler: intel, version: '2024.1'} - os: macos-13 - toolchain: {compiler: gcc, version: 13} + toolchain: {compiler: gcc, version: 13} env: BUILD_DIR: ${{ matrix.build == 'cmake' && 'build' || '.' }}