Skip to content

Commit

Permalink
maint: Re-add intel mac build, on arm this time
Browse files Browse the repository at this point in the history
  • Loading branch information
roberth committed Feb 25, 2025
1 parent 8384e41 commit ce501a1
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -40,6 +46,7 @@ jobs:
extra_nix_config: |
sandbox = true
max-jobs = 1
system = "${{ matrix.system }}"
- uses: DeterminateSystems/magic-nix-cache-action@main

Check warning on line 50 in .github/workflows/ci.yml

View workflow job for this annotation

GitHub Actions / tests on ubuntu

Magic Nix Cache is deprecated

Magic Nix Cache has been deprecated due to a change in the underlying GitHub APIs and will stop working on 1 February 2025. To continue caching Nix builds in GitHub Actions, use FlakeHub Cache instead. Replace... - uses: DeterminateSystems/magic-nix-cache-action@main ...with... - uses: DeterminateSystems/flakehub-cache-action@main For more details: https://dtr.mn/magic-nix-cache-eol

Check warning on line 50 in .github/workflows/ci.yml

View workflow job for this annotation

GitHub Actions / tests on ubuntu

Magic Nix Cache is deprecated

Magic Nix Cache has been deprecated due to a change in the underlying GitHub APIs and will stop working on 1 February 2025. To continue caching Nix builds in GitHub Actions, use FlakeHub Cache instead. Replace... - uses: DeterminateSystems/magic-nix-cache-action@main ...with... - uses: DeterminateSystems/flakehub-cache-action@main For more details: https://dtr.mn/magic-nix-cache-eol

Check warning on line 50 in .github/workflows/ci.yml

View workflow job for this annotation

GitHub Actions / tests on macos (aarch64)

Magic Nix Cache is deprecated

Magic Nix Cache has been deprecated due to a change in the underlying GitHub APIs and will stop working on 1 February 2025. To continue caching Nix builds in GitHub Actions, use FlakeHub Cache instead. Replace... - uses: DeterminateSystems/magic-nix-cache-action@main ...with... - uses: DeterminateSystems/flakehub-cache-action@main For more details: https://dtr.mn/magic-nix-cache-eol

Check warning on line 50 in .github/workflows/ci.yml

View workflow job for this annotation

GitHub Actions / tests on macos (aarch64)

Magic Nix Cache is deprecated

Magic Nix Cache has been deprecated due to a change in the underlying GitHub APIs and will stop working on 1 February 2025. To continue caching Nix builds in GitHub Actions, use FlakeHub Cache instead. Replace... - uses: DeterminateSystems/magic-nix-cache-action@main ...with... - uses: DeterminateSystems/flakehub-cache-action@main For more details: https://dtr.mn/magic-nix-cache-eol

Check warning on line 50 in .github/workflows/ci.yml

View workflow job for this annotation

GitHub Actions / vm_tests

Magic Nix Cache is deprecated

Magic Nix Cache has been deprecated due to a change in the underlying GitHub APIs and will stop working on 1 February 2025. To continue caching Nix builds in GitHub Actions, use FlakeHub Cache instead. Replace... - uses: DeterminateSystems/magic-nix-cache-action@main ...with... - uses: DeterminateSystems/flakehub-cache-action@main For more details: https://dtr.mn/magic-nix-cache-eol

Check warning on line 50 in .github/workflows/ci.yml

View workflow job for this annotation

GitHub Actions / flake_regressions

Magic Nix Cache is deprecated

Magic Nix Cache has been deprecated due to a change in the underlying GitHub APIs and will stop working on 1 February 2025. To continue caching Nix builds in GitHub Actions, use FlakeHub Cache instead. Replace... - uses: DeterminateSystems/magic-nix-cache-action@main ...with... - uses: DeterminateSystems/flakehub-cache-action@main For more details: https://dtr.mn/magic-nix-cache-eol

Check warning on line 50 in .github/workflows/ci.yml

View workflow job for this annotation

GitHub Actions / flake_regressions

Magic Nix Cache is deprecated

Magic Nix Cache has been deprecated due to a change in the underlying GitHub APIs and will stop working on 1 February 2025. To continue caching Nix builds in GitHub Actions, use FlakeHub Cache instead. Replace... - uses: DeterminateSystems/magic-nix-cache-action@main ...with... - uses: DeterminateSystems/flakehub-cache-action@main For more details: https://dtr.mn/magic-nix-cache-eol

Check warning on line 50 in .github/workflows/ci.yml

View workflow job for this annotation

GitHub Actions / tests on macos (x86_64)

Magic Nix Cache is deprecated

Magic Nix Cache has been deprecated due to a change in the underlying GitHub APIs and will stop working on 1 February 2025. To continue caching Nix builds in GitHub Actions, use FlakeHub Cache instead. Replace... - uses: DeterminateSystems/magic-nix-cache-action@main ...with... - uses: DeterminateSystems/flakehub-cache-action@main For more details: https://dtr.mn/magic-nix-cache-eol

Check warning on line 50 in .github/workflows/ci.yml

View workflow job for this annotation

GitHub Actions / tests on macos (x86_64)

Magic Nix Cache is deprecated

Magic Nix Cache has been deprecated due to a change in the underlying GitHub APIs and will stop working on 1 February 2025. To continue caching Nix builds in GitHub Actions, use FlakeHub Cache instead. Replace... - uses: DeterminateSystems/magic-nix-cache-action@main ...with... - uses: DeterminateSystems/flakehub-cache-action@main For more details: https://dtr.mn/magic-nix-cache-eol
# 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
Expand All @@ -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
Expand Down

0 comments on commit ce501a1

Please sign in to comment.