From c5fe6b9a892710fc406b625e20bad437b03d5b2b Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 25 Feb 2025 15:42:59 +0100 Subject: [PATCH] maint: Re-add intel mac build, on arm this time --- .github/workflows/ci.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6169c0924..de5aa4c57 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,9 +23,15 @@ jobs: include: - scenario: on ubuntu runs-on: ubuntu-24.04 + system: x86_64-linux os: linux - - scenario: on macos + - scenario: on macos (aarch64) runs-on: macos-14 + system: aarch64-darwin + os: darwin + - scenario: on macos (x86_64) + runs-on: macos-14 + system: x86_64-darwin os: darwin name: tests ${{ matrix.scenario }} runs-on: ${{ matrix.runs-on }} @@ -40,6 +46,7 @@ jobs: extra_nix_config: | sandbox = true max-jobs = 1 + system = ${{ matrix.system }} - uses: DeterminateSystems/magic-nix-cache-action@main # Since ubuntu 22.30, unprivileged usernamespaces are no longer allowed to map to the root user: # https://ubuntu.com/blog/ubuntu-23-10-restricted-unprivileged-user-namespaces @@ -58,6 +65,7 @@ jobs: strategy: fail-fast: false matrix: + # No x86_64-darwin (yet?) because of poor performance and similarity to aarch64-darwin include: - scenario: on ubuntu runs-on: ubuntu-24.04