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: arm64 builds #3943

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ jobs:

- name: Install Cross
# We need a nightly version of cross for `cross-util`.
run: cargo install cross --git https://github.com/cross-rs/cross --rev 085092c
run: cargo install cross --git https://github.com/cross-rs/cross --rev 1901fd7

- name: Compile
run: |
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
**Internal**:

- Bumped `sentry-native` submodule to v0.7.8. ([#3940](https://github.com/getsentry/relay/pull/3940))
- Bumped arm64 cross compile image to `edge` tag. ([#3943](https://github.com/getsentry/relay/pull/3943))

## 24.8.0

Expand Down
12 changes: 9 additions & 3 deletions Cross.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
[build]
pre-build = [
# Use azure mirrors for faster downloads.
# Use Azure mirrors for faster downloads
"sed -i -e 's/archive.archive.ubuntu.com/azure.archive.ubuntu.com/' /etc/apt/sources.list",
"sed -i -e 's/security.archive.ubuntu.com/azure.archive.ubuntu.com/' /etc/apt/sources.list",
"apt-get update && apt-get --assume-yes install libclang-8-dev clang-8",

# Enable multiarch and install the necessary dependencies
"dpkg --add-architecture $CROSS_DEB_ARCH",
"apt-get update",
"apt-get -y install libclang-8-dev zlib1g-dev:$CROSS_DEB_ARCH",

"curl -sL https://sentry.io/get-cli/ | sh",
]

[target.aarch64-unknown-linux-gnu]
# We're using a nightly `cross`, let's still use a stable image.
image = "ghcr.io/cross-rs/aarch64-unknown-linux-gnu:0.2.5"
image = "ghcr.io/cross-rs/aarch64-unknown-linux-gnu:edge"
env.passthrough = ["CMAKE_TOOLCHAIN_FILE_aarch64_unknown_linux_gnu="]
11 changes: 11 additions & 0 deletions rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
[toolchain]
channel = "1.80.1"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need this override now?

profile = "default"
components = [
"rustc",
"cargo",
"clippy",
"rustfmt",
"rust-analyzer",
"rust-src",
]
Loading