Merge branch 'main' into dev-panic-free

cryspen · Feb 5, 2025 · 3863c05 · 3863c05
2 parents c958fae + 20dc15a
commit 3863c05
Show file tree

Hide file tree

Showing 173 changed files with 3,386 additions and 2,582 deletions.
diff --git a/.github/workflows/hax.yml b/.github/workflows/hax.yml
@@ -15,6 +15,10 @@ on:
       hax_rev:
         description: "The hax revision you want this job to use"
         default: "main"
+      skip_diff:
+        description: "Skip diff jobs"
+        default: false
+        type: boolean
   merge_group:
 
 env:
@@ -33,7 +37,7 @@ jobs:
       - uses: hacspec/hax-actions@main
         with:
           hax_reference: ${{ github.event.inputs.hax_rev || 'main' }}
-          fstar: v2024.12.03
+          fstar: v2025.01.17
 
       - name: 🏃 Extract ML-KEM crate
         working-directory: libcrux-ml-kem
@@ -59,6 +63,7 @@ jobs:
           path: ~/fstar-extraction-mlkem
 
       - name: = Diff Extraction
+        if: ${{ github.event.inputs.skip_diff != 'false' }}
         run: |
           diff -r libcrux-ml-kem/proofs/fstar/extraction/ \
             ~/fstar-extraction-mlkem/fstar/extraction/
@@ -74,7 +79,7 @@ jobs:
       - uses: hacspec/hax-actions@main
         with:
           hax_reference: ${{ github.event.inputs.hax_rev || 'main' }}
-          fstar: v2024.12.03
+          fstar: v2025.01.17
 
       - name: 🏃 Lax ML-KEM crate
         working-directory: libcrux-ml-kem
@@ -88,7 +93,7 @@ jobs:
       - uses: hacspec/hax-actions@main
         with:
           hax_reference: ${{ github.event.inputs.hax_rev || 'main' }}
-          fstar: v2024.12.03
+          fstar: v2025.01.17
 
       - name: 🏃 Extract ML-DSA crate
         working-directory: libcrux-ml-dsa
@@ -114,6 +119,7 @@ jobs:
           path: ~/fstar-extraction-mldsa
 
       - name: = Diff Extraction
+        if: ${{ github.event.inputs.skip_diff != 'false' }}
         run: |
           diff -r libcrux-ml-dsa/proofs/fstar/extraction/ \
             ~/fstar-extraction-mldsa/fstar/extraction/
@@ -129,7 +135,7 @@ jobs:
       - uses: hacspec/hax-actions@main
         with:
           hax_reference: ${{ github.event.inputs.hax_rev || 'main' }}
-          fstar: v2024.12.03
+          fstar: v2025.01.17
 
       - name: 🏃 Lax ML-DSA crate
         working-directory: libcrux-ml-dsa

diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: DeterminateSystems/nix-installer-action@v16
-      - uses: DeterminateSystems/magic-nix-cache-action@v7
+      - uses: DeterminateSystems/magic-nix-cache-action@v9
       - name: Install & configure Cachix
         shell: bash
         run: |