Skip to content
Open
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
12 changes: 6 additions & 6 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ CPATH = { value = "crates/memtrack/musl", relative = true }
# have to be added back, last so they never shadow the toolchain's own. Scoped
# per target: cc-rs looks up `CFLAGS_<target>` before `CFLAGS`, and libbpf-sys
# builds zlib, elfutils and libbpf from `cc::Tool::cflags_env()`.
#
# rustc links with `-nodefaultlibs`, so libgcc's outline-atomic helpers that
# gcc calls by default on aarch64 are missing: inline the atomics instead. A
# `-lgcc` in `target.<triple>.rustflags` would be dropped whenever `RUSTFLAGS`
# is set in the environment.
CFLAGS_x86_64_unknown_linux_musl = "-idirafter /usr/include/x86_64-linux-gnu -idirafter /usr/include"
CFLAGS_aarch64_unknown_linux_musl = "-idirafter /usr/include/aarch64-linux-gnu -idirafter /usr/include"

# rustc links with `-nodefaultlibs`; libbpf's C code needs the outline-atomic
# helpers from libgcc on aarch64.
[target.aarch64-unknown-linux-musl]
rustflags = ["-C", "link-arg=-lgcc"]
CFLAGS_aarch64_unknown_linux_musl = "-mno-outline-atomics -idirafter /usr/include/aarch64-linux-gnu -idirafter /usr/include"
27 changes: 0 additions & 27 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -310,32 +310,6 @@ jobs:
runner-version: rev:${{ env.CODSPEED_REV }}
skip-hash-check-warning: true

musl-build:
runs-on: ${{ matrix.runner }}
strategy:
fail-fast: false
matrix:
include:
- runner: ubuntu-latest
target: x86_64-unknown-linux-musl
- runner: ubuntu-24.04-arm
target: aarch64-unknown-linux-musl
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
with:
submodules: true
- uses: ./.github/actions/install-rust
with:
cache-key: ${{ matrix.target }}
- uses: ./.github/actions/install-bpf-deps
- name: Install the musl toolchain
run: |
sudo apt-get install -y musl-tools linux-libc-dev
rustup target add "${{ matrix.target }}"

- name: Build
run: cargo build --bin codspeed --target "${{ matrix.target }}"

check:
runs-on: ubuntu-latest
if: always()
Expand All @@ -348,7 +322,6 @@ jobs:
- basic-run-test
- macos-basic-run-test
- bpf-tests
- musl-build
- benchmarks
- memtrack-benchmarks
steps:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/create-draft-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ on:

jobs:
main:
if: github.event_name != 'pull_request'
runs-on: ubuntu-latest
env:
PLAN: ${{ inputs.plan }}
Expand Down
5 changes: 3 additions & 2 deletions dist-workspace.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ ci = "github"
installers = ["shell"]
# The archive format to use for non-windows builds (defaults .tar.xz)
unix-archive = ".tar.gz"
# Which actions to run on pull requests
pr-run-mode = "plan"
# Builds every artifact on PRs and keeps them on the workflow run; only a tag push publishes
pr-run-mode = "upload"
# Post-announce jobs to run in CI
post-announce-jobs = ["./post-announce"]
# Path that installers should place binaries in
Expand All @@ -39,4 +39,5 @@ allow-dirty = ["ci"]
"actions/download-artifact" = "37930b1c2abaa49bbe596cd826c3c89aef350131" # v7.0.0

[dist.github-custom-runners]
aarch64-apple-darwin = "macos-latest"
aarch64-unknown-linux-musl = "ubuntu-26.04-arm"
Loading