Merge branch 'main' into morgan/issue/117b

valida-xyz · Mar 18, 2024 · 8b28139 · 8b28139
2 parents 1247158 + 04b0436
commit 8b28139
Show file tree

Hide file tree

Showing 25 changed files with 1,674 additions and 123 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,12 +15,6 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout Plonky3
-        uses: actions/checkout@v4
-        with:
-          repository: Plonky3/Plonky3
-          path: Plonky3
-
       - name: Checkout Valida
         uses: actions/checkout@v4
         with:
@@ -45,12 +39,6 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Checkout Plonky3
-        uses: actions/checkout@v4
-        with:
-          repository: Plonky3/Plonky3
-          path: Plonky3
-
       - name: Checkout Valida
         uses: actions/checkout@v4
         with:

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,3 @@
 /target
-Cargo.lock
 tmp
+.cargo/config.toml