From 39a08b62b915c9d28d4f0ae5707bc0da73b63c67 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Wed, 5 Jun 2024 09:21:51 +0200 Subject: [PATCH] Use libcrux dev in CI --- .github/workflows/ci.yml | 5 ++++- flake.nix | 7 +++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a799b199f..7b6d3b579 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -64,6 +64,7 @@ jobs: uses: actions/checkout@v4 with: repository: cryspen/libcrux + ref: dev # Kyber expects Eurydice's sources in `$EURYDICE_HOME`, # not the install directory. - name: checkout eurydice @@ -83,4 +84,6 @@ jobs: echo FSTAR_HOME=$(pwd)/fstar >> $GITHUB_ENV echo KRML_HOME=$(pwd)/karamel >> $GITHUB_ENV - name: build kyber - run: nix develop github:aeneasverif/charon/${{ github.sha }} --command bash kyber-crate.sh + run: | + cd libcrux-ml-kem + nix develop 'github:aeneasverif/charon/${{ github.sha }}#kyber-ci' --command ./c.sh diff --git a/flake.nix b/flake.nix index 98346e10c..a4411f86a 100644 --- a/flake.nix +++ b/flake.nix @@ -242,6 +242,13 @@ self.packages.${system}.charon-ml ]; }; + # The dev-shell we need to run kyber in CI. This doesn't really belong here but it's easier here. + devShells.kyber-ci = pkgs.mkShell { + packages = [ + rustToolchain + pkgs.clang-tools # For clang-format + ]; + }; checks = { inherit charon-ml-tests charon-check-fmt charon-ml-check-fmt; }; # Export this function so that users of charon can use it in nix. This