nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-16 07:22:43 +01:00
Code Activity

maint: Re-add intel mac build, on arm this time

Browse source
This commit is contained in:
Robert Hensing 2025-02-25 15:42:59 +01:00
parent 8384e41b76
commit c5fe6b9a89
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
.github/workflows/ci.yml vendored
View file

@ -23,9 +23,15 @@ jobs:
include: include:
- scenario: on ubuntu - scenario: on ubuntu
runs-on: ubuntu-24.04 runs-on: ubuntu-24.04
system: x86_64-linux
os: linux os: linux
- scenario: on macos - scenario: on macos (aarch64)
runs-on: macos-14 runs-on: macos-14
system: aarch64-darwin
os: darwin
- scenario: on macos (x86_64)
runs-on: macos-14
system: x86_64-darwin
os: darwin os: darwin
name: tests ${{ matrix.scenario }} name: tests ${{ matrix.scenario }}
runs-on: ${{ matrix.runs-on }} runs-on: ${{ matrix.runs-on }}
@ -40,6 +46,7 @@ jobs:
extra_nix_config: | extra_nix_config: |
sandbox = true sandbox = true
max-jobs = 1 max-jobs = 1
system = ${{ matrix.system }}
- uses: DeterminateSystems/magic-nix-cache-action@main - uses: DeterminateSystems/magic-nix-cache-action@main
# Since ubuntu 22.30, unprivileged usernamespaces are no longer allowed to map to the root user: # 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 # https://ubuntu.com/blog/ubuntu-23-10-restricted-unprivileged-user-namespaces
@ -58,6 +65,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
# No x86_64-darwin (yet?) because of poor performance and similarity to aarch64-darwin
include: include:
- scenario: on ubuntu - scenario: on ubuntu
runs-on: ubuntu-24.04 runs-on: ubuntu-24.04