From eabca75d0ce6de7f4e4bd37037c6f2056375e9e3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 19 Feb 2025 00:52:32 +0100 Subject: [PATCH 1/2] Test on x86_64-darwin --- .github/workflows/ci.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 86a673b37..fa5f934ff 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,6 +34,11 @@ jobs: with: os: UbuntuLatest32Cores128GArm + build_x86_64-darwin: + uses: ./.github/workflows/build.yml + with: + os: macos-13 + build_aarch64-darwin: uses: ./.github/workflows/build.yml with: @@ -51,6 +56,12 @@ jobs: with: os: UbuntuLatest32Cores128GArm + test_x86_64-darwin: + uses: ./.github/workflows/test.yml + needs: build_aarch64-darwin + with: + os: macos-13 + test_aarch64-darwin: uses: ./.github/workflows/test.yml needs: build_aarch64-darwin From 0339ba582ea095d211bb9cf3713978c9ac805413 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 19 Feb 2025 09:09:57 +0100 Subject: [PATCH 2/2] magic-nix-cache-action -> flakehub-cache-action --- .github/workflows/build.yml | 4 ++-- .github/workflows/ci.yml | 4 ++-- .github/workflows/test.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ef7174c30..230d4590d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,5 +17,5 @@ jobs: - uses: DeterminateSystems/nix-installer-action@main with: flakehub: true - - uses: DeterminateSystems/magic-nix-cache-action@main - - run: nix build + - uses: DeterminateSystems/flakehub-cache-action@main + - run: nix build -L diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fa5f934ff..8d3aa5d01 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -76,7 +76,7 @@ jobs: - uses: DeterminateSystems/nix-installer-action@main with: flakehub: true - - uses: DeterminateSystems/magic-nix-cache-action@main + - uses: DeterminateSystems/flakehub-cache-action@main - run: | nix build -L \ .#hydraJobs.tests.functional_user \ @@ -104,5 +104,5 @@ jobs: - uses: DeterminateSystems/nix-installer-action@main with: flakehub: true - - uses: DeterminateSystems/magic-nix-cache-action@main + - uses: DeterminateSystems/flakehub-cache-action@main - run: nix build -L --out-link ./new-nix && PATH=$(pwd)/new-nix/bin:$PATH MAX_FLAKES=25 flake-regressions/eval-all.sh diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 14e4c5fa5..e58827a9c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,5 +17,5 @@ jobs: - uses: DeterminateSystems/nix-installer-action@main with: flakehub: true - - uses: DeterminateSystems/magic-nix-cache-action@main + - uses: DeterminateSystems/flakehub-cache-action@main - run: nix flake check -L