Merge branch 'main' into update-rustc-madness

hacspec · Jun 27, 2024 · a9adabf · a9adabf
2 parents 2b39ef6 + a4ea5b7
commit a9adabf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/install_and_test.yml b/.github/workflows/install_and_test.yml
@@ -14,6 +14,10 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - uses: DeterminateSystems/nix-installer-action@main
+    - uses: cachix/cachix-action@v15
+      with:
+        name: hax
+        skipPush: true
     - uses: DeterminateSystems/magic-nix-cache-action@main
     - name: Build
       run: nix build -L
@@ -47,7 +51,6 @@ jobs:
       env:
         CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
       run: |
-        nix profile install nixpkgs#cachix nixpkgs#jq
         nix build .# .#fstar --json \
           | jq -r '.[].outputs | to_entries[].value' \
           | cachix push hax

diff --git a/engine/backends/fstar/fstar-surface-ast/z.ml b/engine/backends/fstar/fstar-surface-ast/z.ml
@@ -5,7 +5,7 @@ let of_t = Base.Int.to_string
 
 let compare = String.compare
 let pp_print = pp
-let hash = String.hash
+let hash = Base.String.hash
 
 
 let to_int: String.t -> Base.Int.t = Base.Int.of_string