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>
This commit is contained in:
Massimiliano Culpo 2024-03-26 20:36:21 +01:00 committed by GitHub
parent 321ffd732b
commit 0841050d20
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 1 deletions

View file

@ -186,9 +186,10 @@ jobs:
flags: unittests,linux,clingo flags: unittests,linux,clingo
# Run unit tests on MacOS # Run unit tests on MacOS
macos: macos:
runs-on: macos-latest runs-on: ${{ matrix.os }}
strategy: strategy:
matrix: matrix:
os: [macos-latest, macos-14]
python-version: ["3.11"] python-version: ["3.11"]
steps: steps:
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # @v2 - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # @v2

View file

@ -9,6 +9,8 @@
import pytest import pytest
import archspec.cpu
import spack.concretize import spack.concretize
import spack.paths import spack.paths
import spack.platforms 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.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): def test_fixup_macos_rpaths(make_dylib, make_object_file):
# For each of these tests except for the "correct" case, the first fixup # 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. # should make changes, and the second fixup should be a null-op.