Skip to content

Commit 3eb0d96

Browse files
committed
ci: simplify aarch64-linux cross-compile (CLI-only, skip UI)
The arm64 multiarch apt setup was failing because the Azure mirror on GitHub runners only serves amd64. Since we don't build the UI for aarch64-linux (server target), we only need the cross-compiler itself, which is amd64-native. Drop the arm64 system libs and the best-effort UI build step.
1 parent e4fe2b5 commit 3eb0d96

1 file changed

Lines changed: 1 addition & 17 deletions

File tree

.github/workflows/release.yml

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -56,21 +56,10 @@ jobs:
5656
- name: Install aarch64 cross-compile toolchain (Linux only)
5757
if: matrix.target == 'aarch64-unknown-linux-gnu'
5858
run: |
59-
sudo dpkg --add-architecture arm64
60-
sudo sed -i 's#^deb http#deb [arch=amd64] http#' /etc/apt/sources.list || true
61-
echo 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy main restricted universe multiverse' | sudo tee /etc/apt/sources.list.d/arm64.list
62-
echo 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports jammy-updates main restricted universe multiverse' | sudo tee -a /etc/apt/sources.list.d/arm64.list
6359
sudo apt-get update
64-
sudo apt-get install -y gcc-aarch64-linux-gnu \
65-
libxkbcommon-dev:arm64 \
66-
libwayland-dev:arm64 \
67-
libxcb1-dev:arm64 libxcb-render0-dev:arm64 libxcb-shape0-dev:arm64 libxcb-xfixes0-dev:arm64 \
68-
libx11-dev:arm64 \
69-
libgl1-mesa-dev:arm64 libglib2.0-dev:arm64 libgtk-3-dev:arm64 || true
60+
sudo apt-get install -y gcc-aarch64-linux-gnu
7061
echo '[target.aarch64-unknown-linux-gnu]' >> ~/.cargo/config.toml
7162
echo 'linker = "aarch64-linux-gnu-gcc"' >> ~/.cargo/config.toml
72-
echo "PKG_CONFIG_PATH=/usr/lib/aarch64-linux-gnu/pkgconfig:/usr/share/pkgconfig" >> $GITHUB_ENV
73-
echo "PKG_CONFIG_ALLOW_CROSS=1" >> $GITHUB_ENV
7463
7564
- name: Install Windows MinGW toolchain
7665
if: matrix.target == 'x86_64-pc-windows-gnu'
@@ -100,11 +89,6 @@ jobs:
10089
if: matrix.target != 'aarch64-unknown-linux-gnu'
10190
run: cargo build --release --target ${{ matrix.target }} --features ui --bin mhrv-rs-ui
10291

103-
- name: Try UI on aarch64-linux (best effort)
104-
if: matrix.target == 'aarch64-unknown-linux-gnu'
105-
continue-on-error: true
106-
run: cargo build --release --target ${{ matrix.target }} --features ui --bin mhrv-rs-ui
107-
10892
- name: Package (unix)
10993
if: runner.os != 'Windows'
11094
run: |

0 commit comments

Comments
 (0)