Skip to content

Commit 5ea334f

Browse files
author
e-tho
committed
Fix cross-compilation dependency management
1 parent efe8078 commit 5ea334f

2 files changed

Lines changed: 29 additions & 14 deletions

File tree

.github/workflows/release.yml

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,28 +11,35 @@ jobs:
1111
runs-on: ubuntu-latest
1212
permissions:
1313
contents: write
14-
1514
steps:
16-
- name: Checkout
17-
uses: actions/checkout@v4
15+
- uses: actions/checkout@v4
16+
- uses: cargo-bins/cargo-binstall@main
17+
- uses: dtolnay/rust-toolchain@stable
18+
with:
19+
toolchain: stable
1820

19-
- name: Install Dependencies
21+
- name: Setup the build env
2022
run: |
21-
sudo apt-get update
22-
sudo apt-get install -y musl-tools podman binutils-aarch64-linux-gnu
23-
cargo install cross --locked
23+
sudo apt-get update && \
24+
sudo apt-get install -y \
25+
podman \
26+
qemu-user-static \
27+
pkg-config \
28+
libdbus-1-dev \
29+
binutils-aarch64-linux-gnu
30+
cargo binstall --no-confirm cross
2431
25-
- name: Build for x86_64
32+
- name: Build for x86_64 linux gnu
2633
run: |
27-
CROSS_CONTAINER_ENGINE=podman cross build --target x86_64-unknown-linux-gnu --release
28-
cp target/x86_64-unknown-linux-gnu/release/bzmenu bzmenu-x86_64-unknown-linux-gnu
29-
strip bzmenu-x86_64-unknown-linux-gnu
34+
cargo build --release
35+
cp target/release/bzmenu bzmenu-x86_64-linux-gnu
36+
strip bzmenu-x86_64-linux-gnu
3037
31-
- name: Build for arm64
38+
- name: Build for aarch64 linux gnu
3239
run: |
3340
CROSS_CONTAINER_ENGINE=podman cross build --target aarch64-unknown-linux-gnu --release
34-
cp target/aarch64-unknown-linux-gnu/release/bzmenu bzmenu-aarch64-unknown-linux-gnu
35-
aarch64-linux-gnu-strip bzmenu-aarch64-unknown-linux-gnu
41+
cp target/aarch64-unknown-linux-gnu/release/bzmenu bzmenu-aarch64-linux-gnu
42+
aarch64-linux-gnu-strip bzmenu-aarch64-linux-gnu
3643
3744
- name: Create Release
3845
uses: softprops/action-gh-release@v1

Cross.toml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[build]
2+
pre-build = [
3+
"dpkg --add-architecture $CROSS_DEB_ARCH",
4+
"apt-get update && apt-get install -y libdbus-1-dev:$CROSS_DEB_ARCH pkg-config:$CROSS_DEB_ARCH",
5+
]
6+
7+
[target.x86_64-unknown-linux-gnu]
8+
image = "ghcr.io/cross-rs/x86_64-unknown-linux-gnu:main"

0 commit comments

Comments
 (0)