From 87f26ce4b908a3d925d637ea42e28ae70a0066b4 Mon Sep 17 00:00:00 2001 From: Derek Cofausper <256792747+decofe@users.noreply.github.com> Date: Mon, 2 Mar 2026 06:45:25 -0800 Subject: [PATCH] fix(ci): fix aarch64-linux release build and dry-run version string (#22705) Co-authored-by: Alexey Shekhirin <5773434+shekhirin@users.noreply.github.com> Co-authored-by: Amp --- .github/workflows/release.yml | 11 +++++++++-- Makefile | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3d3309a069..b4e00f8bb5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,7 +37,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Extract version - run: echo "VERSION=${GITHUB_REF_NAME}" >> $GITHUB_OUTPUT + run: echo "VERSION=${GITHUB_REF_NAME//\//-}" >> $GITHUB_OUTPUT id: extract_version outputs: VERSION: ${{ steps.extract_version.outputs.VERSION }} @@ -79,6 +79,7 @@ jobs: profile: maxperf allow_fail: false rustflags: "" + native: true - target: x86_64-apple-darwin os: macos-14 profile: maxperf @@ -100,6 +101,7 @@ jobs: target: ${{ matrix.configs.target }} - uses: mozilla-actions/sccache-action@v0.0.9 - name: Install cross main + if: ${{ !matrix.configs.native }} id: cross_main run: | cargo install cross --locked --git https://github.com/cross-rs/cross @@ -114,7 +116,12 @@ jobs: echo "MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx --show-sdk-platform-version)" >> $GITHUB_ENV - name: Build Reth - run: make PROFILE=${{ matrix.configs.profile }} EXTRA_RUSTFLAGS="${{ matrix.configs.rustflags }}" ${{ matrix.build.command }}-${{ matrix.configs.target }} + run: | + if [ "${{ matrix.configs.native }}" = "true" ]; then + make PROFILE=${{ matrix.configs.profile }} EXTRA_RUSTFLAGS="${{ matrix.configs.rustflags }}" ${{ matrix.build.command }}-native-${{ matrix.configs.target }} + else + make PROFILE=${{ matrix.configs.profile }} EXTRA_RUSTFLAGS="${{ matrix.configs.rustflags }}" ${{ matrix.build.command }}-${{ matrix.configs.target }} + fi - name: Move binary run: | mkdir artifacts diff --git a/Makefile b/Makefile index 9fec1a2d0c..c1c3df611b 100644 --- a/Makefile +++ b/Makefile @@ -95,6 +95,7 @@ build-native-%: # on other systems. JEMALLOC_SYS_WITH_LG_PAGE=16 tells jemalloc to use 64-KiB # pages. See: https://github.com/paradigmxyz/reth/issues/6742 build-aarch64-unknown-linux-gnu: export JEMALLOC_SYS_WITH_LG_PAGE=16 +build-native-aarch64-unknown-linux-gnu: export JEMALLOC_SYS_WITH_LG_PAGE=16 # Note: The additional rustc compiler flags are for intrinsics needed by MDBX. # See: https://github.com/cross-rs/cross/wiki/FAQ#undefined-reference-with-build-std