Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix aarch release build #464

Merged
merged 1 commit into from
Mar 6, 2025
Merged
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
11 changes: 10 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -66,7 +66,16 @@ jobs:
- uses: actions/checkout@v2
with:
submodules: true
- uses: actions-rs/toolchain@v1
- if: runner.os == 'macOS'
uses: actions-rs/toolchain@v1
with:
toolchain: 1.63.0
target: aarch64-apple-darwin
default: true
override: true
profile: minimal
- if: runner.os != 'macOS'
uses: actions-rs/toolchain@v1
with:
toolchain: 1.63.0
override: true
6 changes: 2 additions & 4 deletions .github/workflows/preview-release.yaml
Original file line number Diff line number Diff line change
@@ -74,6 +74,8 @@ jobs:
brew install automake bison
echo "/usr/local/opt/bison/bin:$PATH" >> $GITHUB_PATH
- run: ./script/make_release
env:
TARGET: ${{ matrix.target }}
- uses: actions/upload-artifact@v3
with:
name: rubyfmt-release-artifact-${{ matrix.os }}-${{ matrix.target }}
@@ -109,10 +111,6 @@ jobs:
- uses: actions/download-artifact@v3
with:
name: rubyfmt-release-artifact-ubuntu-20.04-aarch64-unknown-linux-gnu
- run: |
# The arch part of this path is set with uname, but we cross-compile the arm build on
# an x86 machine, so we want to make sure the name is correct for the release
mv rubyfmt-${{ steps.get-latest-tag.outputs.tag }}-Linux-x86_64.tar.gz rubyfmt-${{ steps.get-latest-tag.outputs.tag }}-Linux-aarch64.tar.gz
- uses: actions/download-artifact@v3
with:
name: rubyfmt-release-artifact-ubuntu-20.04-native
2 changes: 1 addition & 1 deletion script/make_release
Original file line number Diff line number Diff line change
@@ -44,7 +44,7 @@ case "$target" in
TARGET_AR=aarch64-linux-gnu-ar \
cargo build --release --target aarch64-unknown-linux-gnu

cargo_target_dir_prefix="aarch64-unknown-linux-gnu"
cargo_target_dir_prefix="aarch64-unknown-linux-gnu/"
# This is kind of a hack, since we're assuming we're on a Linux host.
release_tarball_os="Linux"
release_tarball_arch="aarch64"