Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: windows support for integration tests #52

Merged
merged 1 commit into from
Jan 20, 2025
Merged

fix: windows support for integration tests #52

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion .github/actions/integration-tests/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,12 @@ runs:

- name: Build compiler-tester
shell: ${{ runner.os == 'Windows' && 'msys2 {0}' || 'bash -ex {0}' }}
run: cargo build --release --bin 'compiler-tester'
run: |
# Use LLD on Windows to properly link with libstdc++.
if [ ${RUNNER_OS} = Windows ]; then
export RUSTFLAGS="${RUSTFLAGS} -C link-arg=-fuse-ld=lld"
fi
cargo build --release --bin 'compiler-tester'

- name: Build zksolc
shell: ${{ runner.os == 'Windows' && 'msys2 {0}' || 'bash' }}
Expand All @@ -47,6 +52,10 @@ runs:
# it is required to workaround the case when multiple zksolc versions are cloned
# e.g. on self-hosted runners
ZKSOLC_VERSION=$(cargo tree --frozen --depth 1 --format {p} | grep -m 1 era-compiler-solidity | sed -n 's/.*#\([0-9a-f]\{7\}\).*/\1/p')
# Use LLD on Windows to properly link with libstdc++.
if [ ${RUNNER_OS} = Windows ]; then
export RUSTFLAGS="${RUSTFLAGS} -C link-arg=-fuse-ld=lld"
fi
cargo build --release \
--manifest-path ${CARGO_HOME}/git/checkouts/era-compiler-solidity-*/${ZKSOLC_VERSION}/Cargo.toml \
--target-dir './target-zksolc/'
Expand All @@ -61,6 +70,10 @@ runs:
# it is required to workaround the case when multiple zkvyper versions are cloned
# e.g. on self-hosted runners
ZKVYPER_VERSION=$(cargo tree --frozen --depth 1 --format {p} | grep -m 1 era-compiler-vyper | sed -n 's/.*#\([0-9a-f]\{7\}\).*/\1/p')
# Use LLD on Windows to properly link with libstdc++.
if [ ${RUNNER_OS} = Windows ]; then
export RUSTFLAGS="${RUSTFLAGS} -C link-arg=-fuse-ld=lld"
fi
cargo build --release \
--manifest-path ${CARGO_HOME}/git/checkouts/era-compiler-vyper-*/${ZKVYPER_VERSION}/Cargo.toml \
--target-dir './target-zkvyper/'
Expand Down
Loading