Merge branch 'main' of github.com:cryspen/bertie

cryspen · Jun 18, 2024 · cb93e3b · cb93e3b
2 parents 83167db + e57d90e
commit cb93e3b
Show file tree

Hide file tree

Showing 38 changed files with 18,730 additions and 1,885 deletions.
diff --git a/.envrc b/.envrc
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,6 +28,9 @@ jobs:
           repository: google/boringssl
           path: boringssl
 
+      - name: Update dependencies
+        run: cargo  update
+
       - name: Build code
         if: matrix.os != 'windows-latest'
         run: cargo build --workspace

diff --git a/.github/workflows/hax.yml b/.github/workflows/hax.yml
@@ -26,6 +26,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Update dependencies
+        run: cargo update
+
       - name: 🔨 OCaml Setup
         uses: ocaml/setup-ocaml@v2
         with:

diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
@@ -0,0 +1,13 @@
+name: Nix
+
+on:
+  push:
+    branches: [main]
+
+jobs:
+  nix:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: DeterminateSystems/nix-installer-action@v12
+      - uses: actions/checkout@v4
+      - run: nix build -L
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
-Cargo.lock
 /target
 
 # CLion
-Original file line number
+Diff line change
@@ -1,4 +1,3 @@
-    Cargo.lock
     /target
     # CLion
@@ Expand Down @@