From 11074b4f26c97775078e58b280f1d70f8ed57516 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marijan=20Petri=C4=8Devi=C4=87?= Date: Tue, 9 Jan 2024 12:23:23 +0100 Subject: [PATCH] flake: add system aarch64-darwin --- .github/workflows/check.yml | 22 +++++++++++++++++----- flake.lock | 6 +++--- flake.nix | 2 +- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index dd69d256..767e8c52 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -6,9 +6,11 @@ on: branches: [main] jobs: - checks: - name: format & build - runs-on: ubuntu-latest + check: + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ ubuntu-latest, macos-latest ] steps: - uses: actions/checkout@v3 - uses: DeterminateSystems/nix-installer-action@main @@ -22,8 +24,18 @@ jobs: - name: check run: nix flake check -L --show-trace - - name: kairos-node + - name: kairos x86_64-darwin + if: matrix.os == 'macos-latest' + run: nix build -L --no-link --show-trace .#packages.x86_64-darwin.kairos + + - name: kairos x86_64-linux + if: matrix.os == 'ubuntu-latest' run: nix build -L --no-link --show-trace .#packages.x86_64-linux.kairos - - name: kairos-prover + - name: kairos-prover x86_64-darwin + if: matrix.os == 'macos-latest' + run: nix build -L --no-link --show-trace .#packages.aarch64-darwin.kairos-prover + + - name: kairos-prover x86_64-linux + if: matrix.os == 'ubuntu-latest' run: nix build -L --no-link --show-trace .#packages.x86_64-linux.kairos-prover diff --git a/flake.lock b/flake.lock index 7a6e9af5..7b23ba1d 100644 --- a/flake.lock +++ b/flake.lock @@ -116,11 +116,11 @@ ] }, "locked": { - "lastModified": 1702299681, - "narHash": "sha256-6bsB0Qwt6HL4tL1AMgzgnKsfgfPqlbFquh/N81Z2vak=", + "lastModified": 1704994018, + "narHash": "sha256-GVUlR2ImYeHkrrdrRieb10w7grSepOSlzxjpiLSHZQ8=", "owner": "cspr-rad", "repo": "risc0pkgs", - "rev": "fcbfbd4581daac7110c84297e46cf501b9ef53f0", + "rev": "452d3547a75f414fff180e8fdedbce5e20ab8136", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 08d5cc74..51d9ed44 100644 --- a/flake.nix +++ b/flake.nix @@ -29,7 +29,7 @@ outputs = inputs@{ self, flake-parts, treefmt-nix, ... }: flake-parts.lib.mkFlake { inherit inputs; } { - systems = [ "x86_64-linux" ]; + systems = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; imports = [ treefmt-nix.flakeModule ./kairos-prover