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.

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

github: migrate to GHA aarch64 runners #5460

Merged
merged 1 commit into from
Feb 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
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
13 changes: 3 additions & 10 deletions .github/workflows/build-binaries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ jobs:
os: ubuntu-24.04
target: x86_64-unknown-linux-gnu
- build: linux-aarch64-musl
os: ubuntu-24.04
os: ubuntu-24.04-arm
target: aarch64-unknown-linux-musl
- build: linux-aarch64-gnu
os: ubuntu-24.04
os: ubuntu-24.04-arm
target: aarch64-unknown-linux-gnu
- build: macos-x86_64
os: macos-13
Expand Down Expand Up @@ -54,14 +54,7 @@ jobs:
target: ${{ matrix.target }}
- name: Build release binary
shell: bash
run: |
CARGO_CMD=cargo
if [[ "${{ matrix.target }}" = aarch64-unknown-linux* ]]; then
echo "Downloading 'cross' binary for aarch64-linux..."
wget -c https://github.com/cross-rs/cross/releases/download/v0.2.5/cross-x86_64-unknown-linux-gnu.tar.gz -O - | tar -xz
CARGO_CMD=$PWD/cross
fi
$CARGO_CMD build --target ${{ matrix.target }} --verbose --release --features packaging,vendored-openssl
run: cargo build --target ${{ matrix.target }} --verbose --release --features packaging,vendored-openssl

- name: Setup artifact directory
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-nix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-24.04, macos-14]
os: [ubuntu-24.04, ubuntu-24.04-arm, macos-14]
runs-on: ${{ matrix.os }}
timeout-minutes: 15 # NOTE (aseipp): keep in-sync with the build.yml timeout limit

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
fail-fast: false
matrix:
# macos-13 is x86; macos-14 is ARM
os: [ubuntu-24.04, macos-13, macos-14, windows-latest]
os: [ubuntu-24.04, ubuntu-24.04-arm, macos-13, macos-14, windows-latest]
cargo_flags: [""]
include:
- os: ubuntu-24.04
Expand Down
12 changes: 2 additions & 10 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
os: ubuntu-24.04
target: x86_64-unknown-linux-musl
- build: linux-aarch64-musl
os: ubuntu-24.04
os: ubuntu-24.04-arm
target: aarch64-unknown-linux-musl
- build: macos-x86_64
os: macos-13
Expand All @@ -48,17 +48,9 @@ jobs:
with:
toolchain: stable
target: ${{ matrix.target }}
- name: Download cross-compilation tool (linux-aarch64)
if: matrix.target == 'aarch64-unknown-linux-musl'
run: wget -c https://github.com/cross-rs/cross/releases/download/v0.2.5/cross-x86_64-unknown-linux-gnu.tar.gz -O - | tar -xz
- name: Build release binary
shell: bash
run: |
CARGO_CMD=cargo
if [ "${{ matrix.target }}" = "aarch64-unknown-linux-musl" ]; then
CARGO_CMD=$PWD/cross
fi
$CARGO_CMD build --target ${{ matrix.target }} --verbose --release --features packaging,vendored-openssl
run: cargo build --target ${{ matrix.target }} --verbose --release --features packaging,vendored-openssl
- name: Build archive
shell: bash
run: |
Expand Down