Merge remote-tracking branch 'origin/main' into mc-ntt-persistence

matter-labs · Feb 11, 2024 · e63dff4 · e63dff4
2 parents f7e7c54 + 0020e39
commit e63dff4
Show file tree

Hide file tree

Showing 11 changed files with 2,631 additions and 111 deletions.
diff --git a/.github/workflows/basic_build.yaml b/.github/workflows/basic_build.yaml
@@ -47,13 +47,13 @@ jobs:
       - name: setup rust
         run: |
           rustup set profile minimal
-          rustup toolchain install nightly-2023-04-17
-          rustup default nightly-2023-04-17
+          rustup toolchain install nightly-2023-08-21
+          rustup default nightly-2023-08-21
 
       - name: build
         run: |
-          cargo +nightly-2023-04-17 build --release
+          cargo +nightly-2023-08-21 build --release
 
       - name: test
         run: |
-          cargo +nightly-2023-04-17 test --release
+          cargo +nightly-2023-08-21 test --release
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
 /target
-/Cargo.lock
 .idea
 *.sh