Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@ jobs:
- uses: Swatinem/rust-cache@v2
with:
cache-on-failure: true
- name: Install cross main
- name: Install cross
id: cross_main
run: |
cargo install cross --git https://github.com/cross-rs/cross
cargo install cross
# Login against a Docker registry except on PR
# https://github.com/docker/login-action
- name: Login into registry ${{ env.REGISTRY }}
Expand Down
21 changes: 7 additions & 14 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,22 +89,22 @@ jobs:
# `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
- runner: Linux-20.04
- runner: ubuntu-22.04
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use custom runner?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we still need a newer gclib to build the aws crate with, do you mean to use a custom 20.04 runner with such update?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I mean Linux-22.04, which should just be ubuntu-22.04 with better specs

Copy link
Collaborator Author

@grandizzy grandizzy Mar 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah, gotcha, when I prev attempted this somehow the Linux-22.04 label was selecting a ubuntu-24.04 runner which made released binaries to fail on 22.04...

See https://github.com/foundry-rs/foundry/actions/runs/13916454423/job/38940305881#step:1:2

Current runner version: '2.322.0'
Runner name: 'Linux-22.04_d4172d20eb25'
Runner group name: 'Foundry'
Machine name: 'runner'
Operating System
  Ubuntu
  24.04.2
  LTS

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's the name of our custom paid runners.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah interesting!

cc @grandizzy https://github.com/foundry-rs/foundry/actions/runners indeed shows Linux-22.04 mapping to Ubuntu 24.04

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TIL, gotcha, will change

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

update the runners in f6fde94 and runner specs was changed too

target: x86_64-unknown-linux-gnu
svm_target_platform: linux-amd64
platform: linux
arch: amd64
- runner: Linux-20.04
- runner: ubuntu-22.04
target: x86_64-unknown-linux-musl
svm_target_platform: linux-amd64
platform: alpine
arch: amd64
- runner: Linux-20.04
- runner: ubuntu-22.04
target: aarch64-unknown-linux-gnu
svm_target_platform: linux-aarch64
platform: linux
arch: arm64
- runner: Linux-20.04
- runner: ubuntu-22.04
target: aarch64-unknown-linux-musl
svm_target_platform: linux-aarch64
platform: alpine
Expand Down Expand Up @@ -142,15 +142,8 @@ jobs:
echo "SDKROOT=$(xcrun -sdk macosx --show-sdk-path)" >> $GITHUB_ENV
echo "MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx --show-sdk-platform-version)" >> $GITHUB_ENV

- name: Linux ARM setup
if: matrix.target == 'aarch64-unknown-linux-gnu'
run: |
sudo apt-get update -y
sudo apt-get install -y gcc-aarch64-linux-gnu
echo "CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV

- name: MUSL setup
if: matrix.target == 'x86_64-unknown-linux-musl' || matrix.target == 'aarch64-unknown-linux-musl'
- name: cross setup
if: matrix.target == 'x86_64-unknown-linux-musl' || matrix.target == 'aarch64-unknown-linux-musl' || matrix.target == 'aarch64-unknown-linux-gnu'
run: |
cargo install cross

Expand All @@ -174,7 +167,7 @@ jobs:

[[ "$TARGET" == *windows* ]] && ext=".exe"

if [[ "$TARGET" == *-musl ]]; then
if [[ "$TARGET" == *-musl || "$TARGET" == "aarch64-unknown-linux-gnu" ]]; then
cross build "${flags[@]}"
else
cargo build "${flags[@]}"
Expand Down
Loading