From ead4105273386a86d99ee23f6bb2a66ec0e69508 Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar <3998+srid@users.noreply.github.com> Date: Mon, 17 Jun 2024 15:48:14 -0400 Subject: [PATCH] chore(ci): Add `x86_64-*` Similar to https://github.com/srid/haskell-flake/pull/329 --- .github/workflows/ci.yaml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 06a7905..595d39c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -7,16 +7,20 @@ on: pull_request: jobs: + configure: - runs-on: self-hosted + runs-on: x86_64-linux outputs: matrix: ${{ steps.set-matrix.outputs.matrix }} steps: - uses: actions/checkout@v4 - id: set-matrix - run: echo "matrix=$(nixci gh-matrix --systems=aarch64-linux,aarch64-darwin | jq -c .)" >> $GITHUB_OUTPUT + run: echo "matrix=$(nixci gh-matrix --systems=x86_64-linux,x86_64-darwin,aarch64-darwin | jq -c .)" >> $GITHUB_OUTPUT + nix: - runs-on: self-hosted + runs-on: ${{ matrix.system }} + permissions: + contents: read needs: configure strategy: matrix: ${{ fromJson(needs.configure.outputs.matrix) }} @@ -24,10 +28,8 @@ jobs: steps: - uses: actions/checkout@v4 - run: | - # My self hosted runner is ARM - sd \ - 'nixpkgs.hostPlatform = "x86_64-linux"' \ - 'nixpkgs.hostPlatform = "aarch64-linux"' \ - ./examples/*/flake.nix - - nixci build --systems "github:nix-systems/${{ matrix.system }}" .#default.${{ matrix.subflake}} + nixci \ + --extra-access-tokens "github.com=${{ secrets.GITHUB_TOKEN }}" \ + build \ + --systems "github:nix-systems/${{ matrix.system }}" \ + .#default.${{ matrix.subflake}}