Merge branch 'main' into add-kairos-server-test-hook

cspr-rad · Apr 18, 2024 · 6ffd7a9 · 6ffd7a9
2 parents cc660ee + 8a7e768
commit 6ffd7a9
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 21 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -64,6 +64,17 @@ jobs:
         if: matrix.os == 'macos-14'
         run: nix build -L --no-link --show-trace .#packages.aarch64-darwin.kairos
 
+      - name: kairos-tx-no-std x86_64-linux
+        if: matrix.os == 'ubuntu-latest'
+        run: nix build -L --no-link --show-trace .#packages.x86_64-linux.kairos-tx-no-std
+
+      - name: kairos-tx-no-std x86_64-darwin
+        if: matrix.os == 'macos-latest'
+        run: nix build -L --no-link --show-trace .#packages.x86_64-darwin.kairos-tx-no-std
+
+      - name: kairos-tx-no-std aarch64-darwin
+        if: matrix.os == 'macos-14'
+        run: nix build -L --no-link --show-trace .#packages.aarch64-darwin.kairos-tx-no-std
       - 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/.github/workflows/extra-check.yml b/.github/workflows/extra-check.yml
diff --git a/flake.nix b/flake.nix
@@ -95,6 +95,11 @@
               cargoArtifacts = self'.packages.kairos-deps;
             });
 
+            kairos-tx-no-std = craneLib.buildPackage (kairosNodeAttrs // {
+              cargoArtifacts = self'.packages.kairos-deps;
+              cargoExtraArgs = "-p kairos-tx --no-default-features";
+            });
+
             cctld = pkgs.runCommand "cctld-wrapped"
               {
                 buildInputs = [ pkgs.makeWrapper ];