Fix system contracts ci

Signed-off-by: Danil <[email protected]>
matter-labs · Sep 17, 2024 · e25daf0 · e25daf0
1 parent 969a92f
commit e25daf0
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 6 deletions.
diff --git a/.github/workflows/build-release.yaml b/.github/workflows/build-release.yaml
@@ -23,6 +23,7 @@ jobs:
         with:
           ref: ${{ inputs.commit }}
           submodules: recursive
+
       - name: Install foundry-zksync
         run: |
           mkdir ./foundry-zksync

diff --git a/.github/workflows/l2-contracts-ci.yaml b/.github/workflows/l2-contracts-ci.yaml
@@ -13,6 +13,13 @@ jobs:
         with:
           submodules: recursive
 
+      - name: Install foundry-zksync
+        run: |
+          mkdir ./foundry-zksync
+          curl -LO https://github.com/matter-labs/foundry-zksync/releases/download/nightly/foundry_nightly_linux_amd64.tar.gz
+          tar zxf foundry_nightly_linux_amd64.tar.gz -C ./foundry-zksync
+          chmod +x ./foundry-zksync/forge ./foundry-zksync/cast
+          echo "$PWD/foundry-zksync" >> $GITHUB_PATH
 
       - name: Use Node.js
         uses: actions/setup-node@v3

diff --git a/.github/workflows/system-contracts-ci.yaml b/.github/workflows/system-contracts-ci.yaml
@@ -11,17 +11,32 @@ jobs:
       - name: Checkout the repository
         uses: actions/checkout@v4
 
+      - name: Install foundry-zksync
+        run: |
+          mkdir ./foundry-zksync
+          curl -LO https://github.com/matter-labs/foundry-zksync/releases/download/nightly/foundry_nightly_linux_amd64.tar.gz
+          tar zxf foundry_nightly_linux_amd64.tar.gz -C ./foundry-zksync
+          chmod +x ./foundry-zksync/forge ./foundry-zksync/cast
+          echo "$PWD/foundry-zksync" >> $GITHUB_PATH
+
       - name: Use Node.js
         uses: actions/setup-node@v3
         with:
           node-version: 18.18.0
           cache: yarn
 
-      - name: Install dependencies
-        run: yarn
+      #      - name: Install dependencies
+      #        run: yarn
 
       - name: Build artifacts
-        run: yarn sc build
+        run: |
+          cd system-contracts
+          yarn install
+          yarn preprocess:system-contracts
+          forge build --zksync --zk-enable-eravm-extensions
+          yarn preprocess:bootloader
+          forge build --zksync --zk-enable-eravm-extensions
+          yarn sc build
 
       - name: Create cache
         uses: actions/cache/save@v3
@@ -54,7 +69,7 @@ jobs:
         run: yarn lint:check
 
   test-bootloader:
-    needs: [build, lint]
+    needs: [ build, lint ]
     runs-on: ubuntu-latest
 
     steps:
@@ -84,7 +99,7 @@ jobs:
           cargo run
 
   test-contracts:
-    needs: [build, lint]
+    needs: [ build, lint ]
     runs-on: ubuntu-latest
 
     steps:
@@ -125,7 +140,7 @@ jobs:
         run: cat era_test_node.log
 
   check-hashes:
-    needs: [build]
+    needs: [ build ]
     runs-on: ubuntu-latest
 
     steps: