Skip to content

Commit b99bce9

Browse files
committed
ci: use native ubuntu-24.04-arm runner for aarch64 build, drop cross
1 parent 2746c48 commit b99bce9

2 files changed

Lines changed: 5 additions & 11 deletions

File tree

.github/workflows/ci-agent.yaml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,18 +47,18 @@ jobs:
4747
# ── 2. Build .deb + .rpm (both arches, musl static) ────────────────────────
4848
build:
4949
name: build / ${{ matrix.arch }}
50-
runs-on: ubuntu-latest
50+
runs-on: ${{ matrix.runner }}
5151
needs: test
5252
strategy:
5353
fail-fast: false
5454
matrix:
5555
include:
5656
- arch: x86_64
57+
runner: ubuntu-latest
5758
target: x86_64-unknown-linux-musl
58-
use-cross: false
5959
- arch: aarch64
60+
runner: ubuntu-24.04-arm
6061
target: aarch64-unknown-linux-musl
61-
use-cross: true
6262
steps:
6363
- uses: actions/checkout@v4
6464

@@ -85,19 +85,13 @@ jobs:
8585
- name: Install system dependencies
8686
run: sudo apt-get update -qq && sudo apt-get install -y --no-install-recommends protobuf-compiler musl-tools
8787

88-
- name: Install cross
89-
if: matrix.use-cross
90-
run: cargo install cross --locked
91-
9288
- name: Install packaging tools
9389
run: |
9490
command -v cargo-deb || cargo install cargo-deb
9591
command -v cargo-generate-rpm || cargo install cargo-generate-rpm
9692
9793
- name: Build and package
98-
run: make -C agent package-musl TARGET=${{ matrix.target }} USE_CROSS=${{ matrix.use-cross && '1' || '0' }}
99-
env:
100-
PROTOC: /usr/bin/protoc
94+
run: make -C agent package-musl TARGET=${{ matrix.target }}
10195

10296
- uses: actions/upload-artifact@v4
10397
with:

agent/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ release:
3434
.PHONY: release-musl
3535
release-musl:
3636
@printf "$(INFO_COLOR) building hades-agent (musl static) target=$(TARGET), version: $(BUILD_VERSION)\n"
37-
CROSS_ENV="PROTOC" $(BUILD_CMD) build --release --workspace --target $(TARGET)
37+
$(BUILD_CMD) build --release --workspace --target $(TARGET)
3838
@printf "$(SUCC_COLOR) build complete: target/$(TARGET)/release/hades-agent\n"
3939

4040
.PHONY: check

0 commit comments

Comments
 (0)