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

ci: update runners (part 3) (final) #6987

Merged
merged 1 commit into from
Feb 1, 2024
Merged

ci: update runners (part 3) (final) #6987

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion .github/scripts/matrices.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def __init__(
# TODO: Figure out how to make this work
# t_linux_arm = Target("Linux-22.04", "aarch64-unknown-linux-gnu", "linux-aarch64")
t_macos = Target("macos-latest-large", "x86_64-apple-darwin", "macosx-amd64")
t_windows = Target("windows-latest", "x86_64-pc-windows-msvc", "windows-amd64")
t_windows = Target("Windows", "x86_64-pc-windows-msvc", "windows-amd64")
targets = [t_linux_x86, t_windows] if is_pr else [t_linux_x86, t_macos, t_windows]

config = [
Expand Down
19 changes: 8 additions & 11 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,39 +66,39 @@ jobs:
uses: ./.github/workflows/docker-publish.yml

release:
name: ${{ matrix.target }} (${{ matrix.os }})
runs-on: ${{ matrix.os }}
name: ${{ matrix.target }} (${{ matrix.runner }})
runs-on: ${{ matrix.runner }}
timeout-minutes: 240
needs: prepare
strategy:
fail-fast: false
matrix:
include:
# `os`: GHA runner
# `runner`: GHA runner label
# `target`: Rust build target triple
# `platform` and `arch`: Used in tarball names
# `svm`: target platform to use for the Solc binary: https://github.com/roynalnaruto/svm-rs/blob/84cbe0ac705becabdc13168bae28a45ad2299749/svm-builds/build.rs#L4-L24
- os: Linux-20.04
- runner: Linux-20.04
target: x86_64-unknown-linux-gnu
svm_target_platform: linux-amd64
platform: linux
arch: amd64
- os: Linux-20.04
- runner: Linux-20.04
target: aarch64-unknown-linux-gnu
svm_target_platform: linux-aarch64
platform: linux
arch: arm64
- os: macos-latest-large
- runner: macos-latest-large
target: x86_64-apple-darwin
svm_target_platform: macosx-amd64
platform: darwin
arch: amd64
- os: macos-latest-large
- runner: macos-latest-large
target: aarch64-apple-darwin
svm_target_platform: macosx-aarch64
platform: darwin
arch: arm64
- os: windows-latest
- runner: Windows
target: x86_64-pc-windows-msvc
svm_target_platform: windows-amd64
platform: win32
Expand Down Expand Up @@ -138,9 +138,6 @@ jobs:
# `keccak-asm` does not support MSVC or aarch64 Linux.
[[ "$target" != *msvc* && "$target" != "aarch64-unknown-linux-gnu" ]] && flags+=(--features=asm-keccak)

# Windows runs out of RAM when building binaries with LLVM
[[ "$target" == *windows* ]] && flags+=(-j1)

[[ "$target" == *windows* ]] && exe=".exe"

cargo build --release --bins --target "$target" "${flags[@]}"
Expand Down
Loading