From 25eb73ae554f4b9bcf14df6abcb744ad09b92b46 Mon Sep 17 00:00:00 2001 From: Vinzenz Schroeter Date: Sun, 4 May 2025 12:22:27 +0200 Subject: [PATCH] remove musl builds --- .github/workflows/rust.yml | 35 +---------------------------------- example/Makefile | 5 ++--- 2 files changed, 3 insertions(+), 37 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 47cb9ee..e9947d5 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -13,6 +13,7 @@ env: RUSTFLAGS: "-Dwarnings" jobs: + build-gnu-apt: runs-on: ubuntu-latest steps: @@ -39,24 +40,6 @@ jobs: - name: build example -- glibc debug run: cd example && make clean && make TARGET=aarch64-unknown-linux-gnu PROFILE=debug - # this _should_ have been -stable, but there is a bug when running in the container ("Invalid cross-device link") - build-musl-beta: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - - name: Update repos - run: sudo apt-get update -qq - - name: Install toolchain - run: sudo apt-get install -qy liblzma-dev gcc make pkgconf musl-dev musl-tools rustup - - name: install rust target - run: rustup default beta && rustup target add aarch64-unknown-linux-musl && rustup component add rust-src && rustup update - - - name: build example -- musl release - run: cd example && make clean && make TARGET=aarch64-unknown-linux-musl PROFILE=release MUSL=1 CARGO="rustup run beta cargo" - - name: build example -- musl debug - run: cd example && make clean && make TARGET=aarch64-unknown-linux-musl PROFILE=debug MUSL=1 CARGO="rustup run beta cargo" - build-size-gnu-unstable: runs-on: ubuntu-latest steps: @@ -71,19 +54,3 @@ jobs: - name: build example -- glibc size-optimized run: cd example && make clean && make TARGET=aarch64-unknown-linux-gnu PROFILE=size-optimized CARGO="rustup run nightly cargo" LTO=1 - - - build-size-musl-unstable: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - - name: Update repos - run: sudo apt-get update -qq - - name: Install toolchain - run: sudo apt-get install -qy liblzma-dev gcc make pkgconf musl-dev musl-tools rustup - - name: install rust targets - run: rustup toolchain install nightly -t aarch64-unknown-linux-musl -c rust-src --no-self-update - - - name: build example -- musl size-optimized - run: cd example && make clean && make TARGET=aarch64-unknown-linux-musl PROFILE=size-optimized MUSL=1 LTO=1 CARGO="rustup run nightly cargo" diff --git a/example/Makefile b/example/Makefile index 353e298..f7111b1 100644 --- a/example/Makefile +++ b/example/Makefile @@ -31,7 +31,6 @@ endif #endif RUST_TARGET_DIR := $(REPO_ROOT)/target/$(TARGET)/$(CFG_PROFILE) -OUT_DIR := $(realpath $(THIS_DIR)/out/) ifeq ($(CFG_PROFILE), size-optimized) CARGO_PROFILE := size-optimized @@ -92,7 +91,7 @@ all: $(_bins) clean: clean-c clean-rust clean-c: - rm -r $(OUT_DIR) || true + rm -r out || true clean-rust: rm $(SERVICEPOINT_HEADER_OUT)/servicepoint.h || true @@ -123,7 +122,7 @@ sizes: $(_bins) ls -lB out analyze-size: out/$(BIN)_unstripped - nm --print-size --size-sort --reverse-sort --radix=d --demangle $(OUT_DIR)/$(BIN)_unstripped \ + nm --print-size --size-sort --reverse-sort --radix=d --demangle out/$(BIN)_unstripped \ | awk '{size=$$2+0; print size "\t" $$4}' \ | less