Skip to content

Commit 8086867

Browse files
committed
Do not install unnecessary cross-compilation toolchain for cargo deb
1 parent a70e523 commit 8086867

File tree

1 file changed

+4
-15
lines changed

1 file changed

+4
-15
lines changed

.github/workflows/deploy.yml

+4-15
Original file line numberDiff line numberDiff line change
@@ -76,25 +76,14 @@ jobs:
7676
tar -vczf "${ARCHIVE_NAME}.tar.gz" "$ARCHIVE_NAME"/*;;
7777
esac
7878
79-
- name: Set up Ubuntu multiarch
80-
if: matrix.target == 'aarch64-unknown-linux-gnu'
81-
run: |
82-
readonly DISTRO_CODENAME=jammy
83-
sudo dpkg --add-architecture arm64
84-
sudo sed -i "s/^deb http/deb [arch=$(dpkg-architecture -q DEB_HOST_ARCH)] http/" /etc/apt/sources.list
85-
sudo sed -i "s/^deb mirror/deb [arch=$(dpkg-architecture -q DEB_HOST_ARCH)] mirror/" /etc/apt/sources.list
86-
for suite in '' '-updates' '-backports' '-security'; do
87-
echo "deb [arch=arm64] http://ports.ubuntu.com/ $DISTRO_CODENAME$suite main universe multiverse" | \
88-
sudo tee -a /etc/apt/sources.list >/dev/null
89-
done
90-
9179
- name: Install QEMU and AArch64 cross compiler
9280
if: matrix.target == 'aarch64-unknown-linux-gnu'
9381
run: |
9482
sudo apt-get -yq update
95-
# libc6 must be present to run executables dynamically linked
96-
# against glibc for the target architecture
97-
sudo apt-get -yq install qemu-user gcc-aarch64-linux-gnu libc6:arm64
83+
# The shared libc AArch64 libraries are needed for cargo deb below
84+
# to be able to infer package requirements with dpkg-shlibdeps
85+
# properly
86+
sudo apt-get -yq install libc6-arm64-cross libgcc-s1-arm64-cross
9887
9988
- name: Build deb archives
10089
if: endsWith(matrix.target, '-linux-gnu')

0 commit comments

Comments
 (0)