From 20079516819f0b2fbcb2e792ea65c623831dde60 Mon Sep 17 00:00:00 2001 From: Eric Berquist Date: Tue, 25 Jun 2024 11:58:18 -0600 Subject: [PATCH 1/3] Ubuntu 24.04 is available --- .github/actionlint.yml | 1 + .github/workflows/build-spack-nodeps.yml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/actionlint.yml b/.github/actionlint.yml index 88e35d5..4882f57 100644 --- a/.github/actionlint.yml +++ b/.github/actionlint.yml @@ -2,3 +2,4 @@ self-hosted-runner: labels: - macos-14 + - ubuntu-24.04 diff --git a/.github/workflows/build-spack-nodeps.yml b/.github/workflows/build-spack-nodeps.yml index e7172c9..2f47e2d 100644 --- a/.github/workflows/build-spack-nodeps.yml +++ b/.github/workflows/build-spack-nodeps.yml @@ -16,7 +16,7 @@ jobs: strategy: matrix: os: - - ubuntu-22.04 + - ubuntu-24.04 - macos-13 - macos-14 version: From 9f681d4ef507fc69c5cb4d918a58fccbf1f0294c Mon Sep 17 00:00:00 2001 From: Eric Berquist Date: Tue, 25 Jun 2024 11:58:47 -0600 Subject: [PATCH 2/3] macro is working again with latest XCode --- .github/workflows/build-spack-nodeps.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build-spack-nodeps.yml b/.github/workflows/build-spack-nodeps.yml index 2f47e2d..afd4766 100644 --- a/.github/workflows/build-spack-nodeps.yml +++ b/.github/workflows/build-spack-nodeps.yml @@ -61,8 +61,7 @@ jobs: spack add binutils@2.41 spack add sst-core@${{ matrix.version }} spack add sst-elements@${{ matrix.version }} - # macro is causing problems on macOS - # spack add sst-macro@${{ matrix.version }} + spack add sst-macro@${{ matrix.version }} spack concretize --reuse --force spack install --fail-fast - name: Push packages and update index From ab9562d58d54e7655502868196f6c3677ac6fcd6 Mon Sep 17 00:00:00 2001 From: Eric Berquist Date: Tue, 25 Jun 2024 11:59:20 -0600 Subject: [PATCH 3/3] switch from 13.1.0 to 14.0.0 --- .github/workflows/build-spack-nodeps.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-spack-nodeps.yml b/.github/workflows/build-spack-nodeps.yml index afd4766..eda9e45 100644 --- a/.github/workflows/build-spack-nodeps.yml +++ b/.github/workflows/build-spack-nodeps.yml @@ -20,7 +20,7 @@ jobs: - macos-13 - macos-14 version: - - '13.1.0' + - '14.0.0' - 'master' fail-fast: false permissions: