From c81cfd1bb3ff16a9061ca074b9a11291c7650b0d Mon Sep 17 00:00:00 2001 From: Anton Baliasnikov Date: Mon, 21 Oct 2024 16:01:01 +0100 Subject: [PATCH] ci: use shared action to build solc --- .github/workflows/build-release.yaml | 4 ++-- .github/workflows/test.yaml | 6 ++++-- liblangutil/Token.h | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-release.yaml b/.github/workflows/build-release.yaml index af2f6894c0..8fe41f6ced 100644 --- a/.github/workflows/build-release.yaml +++ b/.github/workflows/build-release.yaml @@ -94,10 +94,10 @@ jobs: - name: Prepare Windows env if: runner.os == 'Windows' - uses: matter-labs/era-compiler-ci/.github/actions/prepare-msys@aba-solc-support + uses: matter-labs/era-compiler-ci/.github/actions/prepare-msys@v1 - name: Building the Solidity compiler - uses: matter-labs/era-compiler-ci/.github/actions/build-solc@aba-solc-support + uses: matter-labs/era-compiler-ci/.github/actions/build-solc@v1 with: release-suffix: ${{ matrix.release-suffix }} zksync-version: ${{ needs.setup.outputs.zksync-version }} diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index bb008ee8ed..2ced77b132 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -84,19 +84,21 @@ jobs: - name: Building the Solidity compiler if: matrix.type == 'candidate' - uses: ./.github/actions/solc-build + uses: matter-labs/era-compiler-ci/.github/actions/build-solc@v1 with: solc-version: ${{ steps.project_version.outputs.solc-version }} zksync-version: 1.0.${{ github.run_id }} build-type: ${{ matrix.type }} + boost-version: 1.77.0 - name: Building the Solidity compiler if: matrix.type == 'reference' - uses: matter-labs/era-solidity/.github/actions/solc-build@latest-ci + uses: matter-labs/era-compiler-ci/.github/actions/build-solc@v1 with: solc-version: ${{ steps.project_version.outputs.solc-version }} zksync-version: 1.0.${{ github.run_id }} build-type: ${{ matrix.type }} + boost-version: 1.77.0 # Integration tests workflow call from the era-compiler-ci repository # This is a common part of the integration tests workflow for all repositories diff --git a/liblangutil/Token.h b/liblangutil/Token.h index eb8015f4d4..9364d6790a 100644 --- a/liblangutil/Token.h +++ b/liblangutil/Token.h @@ -44,6 +44,7 @@ #include +#include #include #include #include