diff options
| author | Massimiliano Culpo <massimiliano.culpo@gmail.com> | 2024-03-26 20:36:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-26 12:36:21 -0700 |
| commit | 0841050d2066cfce51435133e78e9842e50a16d6 (patch) | |
| tree | 5651333b1d5559f29dfaf82972f19edab1ea0798 | |
| parent | 321ffd732b124fb1eed83ce21d2e744c7c77176f (diff) | |
| download | spack-0841050d2066cfce51435133e78e9842e50a16d6.tar.gz spack-0841050d2066cfce51435133e78e9842e50a16d6.tar.bz2 spack-0841050d2066cfce51435133e78e9842e50a16d6.tar.xz spack-0841050d2066cfce51435133e78e9842e50a16d6.zip | |
Add macos-14 as a runner (Apple M1) (#42728)
* Add macos-14 as a runner (Apple M1)
* Mark a test xfail
We need to check later if this test needs modifications
on Apple Silicon chips.
---------
Co-authored-by: Harmen Stoppels <me@harmenstoppels.nl>
Co-authored-by: alalazo <alalazo@users.noreply.github.com>
| -rw-r--r-- | .github/workflows/unit_tests.yaml | 3 | ||||
| -rw-r--r-- | lib/spack/spack/test/relocate.py | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/.github/workflows/unit_tests.yaml b/.github/workflows/unit_tests.yaml index 26df165093..fa53ecd5bc 100644 --- a/.github/workflows/unit_tests.yaml +++ b/.github/workflows/unit_tests.yaml @@ -186,9 +186,10 @@ jobs: flags: unittests,linux,clingo # Run unit tests on MacOS macos: - runs-on: macos-latest + runs-on: ${{ matrix.os }} strategy: matrix: + os: [macos-latest, macos-14] python-version: ["3.11"] steps: - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # @v2 diff --git a/lib/spack/spack/test/relocate.py b/lib/spack/spack/test/relocate.py index 0ed6af59e2..fbc232e3ca 100644 --- a/lib/spack/spack/test/relocate.py +++ b/lib/spack/spack/test/relocate.py @@ -9,6 +9,8 @@ import shutil import pytest +import archspec.cpu + import spack.concretize import spack.paths import spack.platforms @@ -282,6 +284,7 @@ def test_relocate_text_bin_raise_if_new_prefix_is_longer(tmpdir): @pytest.mark.requires_executables("install_name_tool", "file", "cc") +@pytest.mark.skipif(str(archspec.cpu.host().family) != "x86_64", reason="failing on Apple M1/M2") def test_fixup_macos_rpaths(make_dylib, make_object_file): # For each of these tests except for the "correct" case, the first fixup # should make changes, and the second fixup should be a null-op. |