Skip to content

Commit

Permalink
ci: Fixed leftovers manual builds (#378)
Browse files Browse the repository at this point in the history
  • Loading branch information
alexandrst88 authored Nov 14, 2023
1 parent af59b7c commit 8981769
Showing 1 changed file with 12 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
with:
submodules: recursive
token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}
ref: ${{ inputs.BRANCH_TAG }}
ref: ${{ needs.setup.outputs.release_tag }}

- name: Prepare environment
run: |
Expand All @@ -59,7 +59,7 @@ jobs:
run: |
mkdir -p ./build
cd ./build
cmake .. -DCMAKE_BUILD_TYPE="Release" -DSOLC_VERSION_ZKEVM="${{ inputs.ZKVM_RELEASE_TAG }}" -DUSE_Z3=OFF
cmake .. -DCMAKE_BUILD_TYPE="Release" -DSOLC_VERSION_ZKEVM="${{ needs.setup.outputs.release_tag }}" -DUSE_Z3=OFF
make -j$(nproc)
pwd
ls -la ./solc/
Expand Down Expand Up @@ -89,7 +89,7 @@ jobs:
with:
submodules: recursive
token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}
ref: ${{ inputs.BRANCH_TAG }}
ref: ${{ needs.setup.outputs.release_tag }}

- name: Prepare environment
run: |
Expand All @@ -101,7 +101,7 @@ jobs:
run: |
mkdir -p ./build
cd ./build
cmake .. -DCMAKE_BUILD_TYPE="Release" -DSOLC_VERSION_ZKEVM="${{ inputs.ZKVM_RELEASE_TAG }}" -DUSE_Z3=OFF -DUSE_CVC4=OFF
cmake .. -DCMAKE_BUILD_TYPE="Release" -DSOLC_VERSION_ZKEVM="${{ needs.setup.outputs.release_tag }}" -DUSE_Z3=OFF -DUSE_CVC4=OFF
make -j$(nproc)
pwd
ls -la ./solc/
Expand All @@ -126,7 +126,7 @@ jobs:
with:
submodules: recursive
token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}
ref: ${{ inputs.BRANCH_TAG }}
ref: ${{ needs.setup.outputs.release_tag }}

- name: Prepare environment
shell: zsh {0}
Expand Down Expand Up @@ -158,7 +158,7 @@ jobs:
run: |
mkdir -p ./build
cd ./build
cmake .. -DCMAKE_BUILD_TYPE="Release" -DSOLC_VERSION_ZKEVM="${{ inputs.ZKVM_RELEASE_TAG }}" -DUSE_Z3=OFF
cmake .. -DCMAKE_BUILD_TYPE="Release" -DSOLC_VERSION_ZKEVM="${{ needs.setup.outputs.release_tag }}" -DUSE_Z3=OFF
- name: Building the Solidity compiler
run: |
Expand Down Expand Up @@ -189,7 +189,7 @@ jobs:
with:
submodules: recursive
token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}
ref: ${{ inputs.BRANCH_TAG }}
ref: ${{ needs.setup.outputs.release_tag }}

- name: Prepare environment
shell: zsh {0}
Expand Down Expand Up @@ -223,7 +223,7 @@ jobs:
run: |
mkdir -p ./build
cd ./build
cmake .. -DCMAKE_BUILD_TYPE="Release" -DSOLC_VERSION_ZKEVM="${{ inputs.ZKVM_RELEASE_TAG }}" -DUSE_Z3=OFF
cmake .. -DCMAKE_BUILD_TYPE="Release" -DSOLC_VERSION_ZKEVM="${{ needs.setup.outputs.release_tag }}" -DUSE_Z3=OFF
- name: Building the Solidity compiler
shell: zsh {0}
Expand Down Expand Up @@ -265,7 +265,7 @@ jobs:
with:
script: |
const semver = require('semver');
const currentVersion = '${{ inputs.BRANCH_TAG }}';
const currentVersion = '${{ needs.setup.outputs.release_tag }}';
const result = semver.lt(currentVersion, '0.6.0');
console.log(`Is the version < 0.6.0? ${result}`);
return result;
Expand All @@ -277,7 +277,7 @@ jobs:
with:
submodules: recursive
token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}
ref: ${{ inputs.BRANCH_TAG }}
ref: ${{ needs.setup.outputs.release_tag }}

- name: Install LLVM and Clang
uses: KyleMayes/install-llvm-action@v1
Expand Down Expand Up @@ -348,7 +348,7 @@ jobs:
mkdir build
cd build
$boost_dir=(Resolve-Path ..\deps\boost\lib\cmake\Boost-*)
cmake .. -D SOLC_VERSION_ZKEVM="${{ inputs.ZKVM_RELEASE_TAG }}" -D USE_Z3="OFF" -DBoost_DIR="$boost_dir\" -DBoost_USE_STATIC_RUNTIME=1 -DBoost_USE_STATIC_LIBS=1 -DBoost_COMPILER=clang15 -T LLVM_v142 -DPEDANTIC=OFF -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded
cmake .. -D SOLC_VERSION_ZKEVM="${{ needs.setup.outputs.release_tag }}" -D USE_Z3="OFF" -DBoost_DIR="$boost_dir\" -DBoost_USE_STATIC_RUNTIME=1 -DBoost_USE_STATIC_LIBS=1 -DBoost_COMPILER=clang15 -T LLVM_v142 -DPEDANTIC=OFF -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded
cmake --build . -j 10 --target install --config Release
- name: Prepare binary file name
Expand Down Expand Up @@ -377,7 +377,7 @@ jobs:
uses: actions/checkout@v3
with:
token: ${{ secrets.ZKSYNC_ADMIN_BOT_ORG_REPO_WRITE }}
ref: ${{ inputs.BRANCH_TAG }}
ref: ${{ needs.setup.outputs.release_tag }}

- name: Download artifact macos_arm64
uses: actions/download-artifact@v3
Expand Down

0 comments on commit 8981769

Please sign in to comment.