Skip to content

Commit af5d59d

Browse files
authored
Merge pull request #116 from nikomatsakis/main
build: use native runners for ARM builds
2 parents e0b0271 + d41b2cf commit af5d59d

File tree

1 file changed

+6
-17
lines changed

1 file changed

+6
-17
lines changed

.github/workflows/release-binaries.yml

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,20 @@ name: Release Binaries
44
on:
55
release:
66
types: [published]
7+
workflow_dispatch:
78

89
permissions:
910
contents: write
1011

1112
jobs:
1213
build-binaries:
1314
name: Build ${{ matrix.target }}
14-
if: startsWith(github.ref_name, 'symposium-acp-agent-v')
15+
if: github.event_name == 'workflow_dispatch' || startsWith(github.ref_name, 'symposium-acp-agent-v')
1516
strategy:
1617
matrix:
1718
include:
1819
- target: x86_64-apple-darwin
19-
os: macos-latest
20+
os: macos-13
2021
artifact: symposium-darwin-x64
2122
- target: aarch64-apple-darwin
2223
os: macos-latest
@@ -25,7 +26,7 @@ jobs:
2526
os: ubuntu-latest
2627
artifact: symposium-linux-x64
2728
- target: aarch64-unknown-linux-musl
28-
os: ubuntu-latest
29+
os: ubuntu-24.04-arm
2930
artifact: symposium-linux-arm64
3031
- target: x86_64-pc-windows-msvc
3132
os: windows-latest
@@ -45,26 +46,14 @@ jobs:
4546
with:
4647
targets: ${{ matrix.target }}
4748

48-
- name: Install musl tools (x86_64)
49-
if: matrix.target == 'x86_64-unknown-linux-musl'
49+
- name: Install musl tools
50+
if: endsWith(matrix.target, '-musl')
5051
run: |
5152
sudo apt-get update
5253
sudo apt-get install -y musl-tools
5354
54-
- name: Install musl cross-compilation tools (aarch64)
55-
if: matrix.target == 'aarch64-unknown-linux-musl'
56-
run: |
57-
sudo apt-get update
58-
sudo apt-get install -y musl-tools gcc-aarch64-linux-gnu musl-dev
59-
# Install aarch64 musl cross toolchain
60-
wget -q https://musl.cc/aarch64-linux-musl-cross.tgz
61-
tar -xzf aarch64-linux-musl-cross.tgz
62-
echo "$PWD/aarch64-linux-musl-cross/bin" >> $GITHUB_PATH
63-
6455
- name: Build
6556
run: cargo build --release --target ${{ matrix.target }} -p symposium-acp-agent
66-
env:
67-
CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_LINKER: aarch64-linux-musl-gcc
6857

6958
- name: Package (Unix)
7059
if: runner.os != 'Windows'

0 commit comments

Comments
 (0)