test

matter-labs · May 27, 2024 · fb8a160 · fb8a160
1 parent 55bd434
commit fb8a160
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
@@ -138,9 +138,11 @@ jobs:
       - name: Prepare custom solc
         if: inputs.custom-solc-run-id != '' && inputs.custom-solc-version != ''
         run: |
-          chmod a+x ./solc-custom-bin/solc-${{ inputs.custom-solc-version}}-${{ matrix.type }}
-          mv ./solc-custom-bin/solc-${{ inputs.custom-solc-version}}-${{ matrix.type }} \
-            ./solc-bin/solc-${{ inputs.custom-solc-version}}
+          find .
+          SOLC_DIR="./solc-custom-bin/solc-${{ inputs.custom-solc-version}}-${{ matrix.type }}"
+          chmod a+x "${SOLC_DIR}/solc-${{ inputs.custom-solc-version}}-${{ matrix.type }}"
+          mv "${SOLC_DIR}/solc-${{ inputs.custom-solc-version}}-${{ matrix.type }}" \
+            "./solc-bin/solc-${{ inputs.custom-solc-version}}"
           echo "Testing with custom solc from run ${{ inputs.custom-solc-run-id }}"
           echo $(./solc-bin/solc-${{ inputs.custom-solc-version}} --version)
 

diff --git a/.github/workflows/integration-tests.yaml b/.github/workflows/integration-tests.yaml
@@ -98,19 +98,24 @@ jobs:
             --target-dir './target-zkvyper/'
 
       - name: Download custom solc
-        if: inputs.custom-solc-run-id != ''
+        if: inputs.custom-solc-run-id != '' && inputs.custom-solc-version != ''
         uses: actions/download-artifact@v4
         with:
-          path: ./solc-bin/
+          pattern: solc*
+          path: ./solc-custom-bin/
           run-id: ${{ inputs.custom-solc-run-id }}
           merge-multiple: true
 
       - name: Prepare custom solc
-        if: inputs.custom-solc-run-id != ''
+        if: inputs.custom-solc-run-id != '' && inputs.custom-solc-version != ''
         run: |
-          chmod a+x ./solc-bin/solc-${{ inputs.custom-solc-version }}
+          find .
+          SOLC_DIR="./solc-custom-bin/solc-${{ inputs.custom-solc-version}}-candidate"
+          chmod a+x "${SOLC_DIR}/solc-${{ inputs.custom-solc-version}}-candidate"
+          mv "${SOLC_DIR}/solc-${{ inputs.custom-solc-version}}-candidate" \
+            "./solc-bin/solc-${{ inputs.custom-solc-version}}"
           echo "Testing with custom solc from run ${{ inputs.custom-solc-run-id }}"
-          echo $(./solc-bin/solc-${{ inputs.custom-solc-version }} --version)
+          echo $(./solc-bin/solc-${{ inputs.custom-solc-version}} --version)
 
       - name: Run integration tests
         run: |