ci: fix wrong branch and vars setup

matter-labs · Apr 4, 2024 · 3a0458b · 3a0458b
1 parent 63961bf
commit 3a0458b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -17,7 +17,7 @@ rustflags = [
 ]
 
 [env]
-LLVM_SYS_150_PREFIX = { value = "./target-llvm/target-final/", relative = true, force = false }
+LLVM_SYS_170_PREFIX = { value = "./target-llvm/target-final/", relative = true, force = false }
 RUST_BACKTRACE = { value = "0" }
 RUST_LOG = { value = "vm=trace" }
 

diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
@@ -46,9 +46,9 @@ jobs:
       - name: Define branches
         run: |
           if [ "${{ matrix.type }}" = "candidate" ]; then
-            echo "COMPILER_TESTER_BRANCH_NAME=${{ github.event.inputs.compiler_tester_candidate_branch || 'main' }}" >> $GITHUB_ENV
+            echo "COMPILER_TESTER_BRANCH_NAME=${{ github.event.inputs.compiler_tester_candidate_branch || github.head_ref }}" >> $GITHUB_ENV
           else
-            echo "COMPILER_TESTER_BRANCH_NAME=${{ github.event.inputs.compiler_tester_reference_branch || 'main' }}" >> $GITHUB_ENV
+            echo "COMPILER_TESTER_BRANCH_NAME=${{ github.event.inputs.compiler_tester_reference_branch || github.event.repository.default_branch }}" >> $GITHUB_ENV
           fi
 
       - name: Checkout compiler-tester
@@ -67,7 +67,6 @@ jobs:
         env:
           RUST_BACKTRACE: full
         run: |
-          export LLVM_SYS_150_PREFIX="$(pwd)/target-llvm/target-final/"
           cargo build --verbose --release --bin 'compiler-tester'
           cargo build --verbose --release --manifest-path /usr/local/cargo/git/checkouts/era-compiler-solidity-*/*/Cargo.toml --target-dir './target-zksolc/'
           cargo build --verbose --release --manifest-path /usr/local/cargo/git/checkouts/era-compiler-vyper-*/*/Cargo.toml --target-dir './target-zkvyper/'

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -28,8 +28,6 @@ jobs:
 
       - name: Run tests
         run: |
-          export RUST_BACKTRACE='full'
-          export LLVM_SYS_150_PREFIX="$(pwd)/target-llvm/target-final/"
           cargo build --verbose --release --bin 'compiler-tester'
           cargo build --verbose --release --manifest-path /usr/local/cargo/git/checkouts/era-compiler-solidity-*/*/Cargo.toml --target-dir './target-zksolc/'
           cargo build --verbose --release --manifest-path /usr/local/cargo/git/checkouts/era-compiler-vyper-*/*/Cargo.toml --target-dir './target-zkvyper/'