Merge pull request #11 from cspr-rad/add-aarch64-darwin

- flake/kairos: add libiconv for darwin builds - ci: add aarch64-darwin check
cspr-rad · Jan 31, 2024 · 71543d7 · 71543d7
2 parents d23e31c + 9f488b2
commit 71543d7
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ ubuntu-latest, macos-latest ]
+        os: [ ubuntu-latest, macos-latest, macos-14 ]
     steps:
       - uses: actions/checkout@v3
       - uses: DeterminateSystems/nix-installer-action@main
@@ -24,18 +24,26 @@ jobs:
       - name: check
         run: nix flake check -L --show-trace
 
+      - 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 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
+      - name: kairos aarch64-darwin
+        if: matrix.os == 'macos-14'
+        run: nix build -L --no-link --show-trace .#packages.aarch64-darwin.kairos
+
+      - name: kairos-prover x86_64-linux
         if: matrix.os == 'ubuntu-latest'
-        run: nix build -L --no-link --show-trace .#packages.x86_64-linux.kairos
+        run: nix build -L --no-link --show-trace .#packages.x86_64-linux.kairos-prover
 
       - name: kairos-prover x86_64-darwin
         if: matrix.os == 'macos-latest'
         run: nix build -L --no-link --show-trace .#packages.x86_64-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
+      - name: kairos-prover aarch64-darwin
+        if: matrix.os == 'macos-14'
+        run: nix build -L --no-link --show-trace .#packages.aarch64-darwin.kairos-prover
diff --git a/flake.nix b/flake.nix
@@ -44,7 +44,13 @@
               src = craneLib.path ./.;
               filter = path: type: craneLib.filterCargoSources path type;
             };
-            nativeBuildInputs = with pkgs; [ pkg-config openssl.dev ];
+            nativeBuildInputs = with pkgs; [ pkg-config ];
+
+            buildInputs = with pkgs; [
+              openssl.dev
+            ] ++ lib.optionals stdenv.isDarwin [
+              libiconv
+            ];
           };
         in
         {