From 87f7f08ef221fbdbc63a6c1fc35d038294eb0a21 Mon Sep 17 00:00:00 2001 From: Eric Berquist Date: Tue, 25 Jun 2024 11:54:28 -0600 Subject: [PATCH] Ubuntu 24.04 is available --- .github/actionlint.yml | 1 + .github/workflows/build-spack-nodeps.yml | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) 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..afd4766 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: @@ -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