ci: make ci little pretty

matter-labs · Sep 18, 2024 · 22de199 · 22de199
1 parent fa1bcbc
commit 22de199
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 16 deletions.
diff --git a/.github/workflows/build-release.yaml b/.github/workflows/build-release.yaml
@@ -44,13 +44,19 @@ jobs:
           yarn
           echo "release_tag=${{ inputs.prefix }}-${{ inputs.commit }}" >> $GITHUB_OUTPUT
 
-      - name: Build contracts
+      - name: Build l1 contracts
+        working-directory: l1-contracts
+        run: |
+          forge build
+
+      - name: Build l2 contracts
+        working-directory: l2-contracts
+        run: |
+          forge build --zksync --zk-enable-eravm-extensions
+
+      - name: Build system-contracts
+        working-directory: system-contracts
         run: |
-          cd l1-contracts/ && forge build
-          cd ..
-          cd l2-contracts/ && forge build --zksync --zk-enable-eravm-extensions
-          cd ..
-          cd system-contracts 
           yarn install
           yarn preprocess:system-contracts
           forge build --zksync --zk-enable-eravm-extensions

diff --git a/.github/workflows/l1-contracts-ci.yaml b/.github/workflows/l1-contracts-ci.yaml
@@ -32,11 +32,15 @@ jobs:
           node-version: 18.18.0
           cache: yarn
 
-      - name: Build artifacts
-        run: cd l1-contracts/ && forge build
+      - name: Build l1 contracts
+        working-directory: l1-contracts
+        run: |
+          forge build
 
-      - name: Build L2 artifacts
-        run: cd l2-contracts/ && forge build --zksync --zk-enable-eravm-extensions
+      - name: Build l2 contracts
+        working-directory: l2-contracts
+        run: |
+          forge build --zksync --zk-enable-eravm-extensions
 
       - name: Create cache
         uses: actions/cache/save@v3

diff --git a/.github/workflows/l2-contracts-ci.yaml b/.github/workflows/l2-contracts-ci.yaml
@@ -30,11 +30,15 @@ jobs:
       - name: Install dependencies
         run: yarn
 
-      - name: Build artifacts
-        run: cd l1-contracts/ && forge build
+      - name: Build l1 contracts
+        working-directory: l1-contracts
+        run: |
+          forge build
 
-      - name: Build L2 artifacts
-        run: cd l2-contracts/ && forge build --zksync --zk-enable-eravm-extensions
+      - name: Build l2 contracts
+        working-directory: l2-contracts
+        run: |
+          forge build --zksync --zk-enable-eravm-extensions
 
       - name: Create cache
         uses: actions/cache/save@v3

diff --git a/.github/workflows/slither.yaml b/.github/workflows/slither.yaml
@@ -48,6 +48,6 @@ jobs:
           rm -rf ./l1-contracts/contracts/dev-contracts/test/VerifierRecursiveTest.sol
 
       - name: Run Slither
+        working-directory: l1-contracts
         run: |
-          cd l1-contracts
           slither --config ./slither.config.json .
diff --git a/.github/workflows/system-contracts-ci.yaml b/.github/workflows/system-contracts-ci.yaml
@@ -28,8 +28,8 @@ jobs:
           cache: yarn
 
       - name: Build artifacts
+        working-directory: system-contracts
         run: |
-          cd system-contracts
           yarn install
           yarn preprocess:system-contracts
           forge build --zksync --zk-enable-eravm-extensions