Skip to content

Commit

Permalink
ci: use shared action to build solc
Browse files Browse the repository at this point in the history
  • Loading branch information
antonbaliasnikov committed Oct 21, 2024
1 parent 8c8f2d0 commit 4aa70e2
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.74.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.74.0

# Integration tests workflow call from the era-compiler-ci repository
# This is a common part of the integration tests workflow for all repositories
Expand Down
1 change: 1 addition & 0 deletions liblangutil/Token.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@

#include <liblangutil/UndefMacros.h>

#include <cstdint>
#include <iosfwd>
#include <string>
#include <tuple>
Expand Down

0 comments on commit 4aa70e2

Please sign in to comment.