Skip to content

Commit a9f9bc0

Browse files
committed
feat!(ci): Remove arm/v7 support
This architecture has become too significant of a maintenance burden, and isn't used often enough to justify the associated maintenance cost. This removes arm/v7 from all the build infrastructure/dockerfiles/etc. Note that arm64 targets are still widely used and well supported. Related: linkerd/linkerd2#14308
1 parent adc8d96 commit a9f9bc0

File tree

3 files changed

+2
-23
lines changed

3 files changed

+2
-23
lines changed

Dockerfile

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -339,18 +339,14 @@ COPY --link --from=just /usr/local/bin/just /usr/local/bin/
339339
FROM rust as rust-musl
340340
RUN rustup target add \
341341
aarch64-unknown-linux-musl \
342-
armv7-unknown-linux-musleabihf \
343342
x86_64-unknown-linux-musl
344343
RUN --mount=type=cache,from=apt-base,source=/etc/apt,target=/etc/apt,ro \
345344
--mount=type=cache,from=apt-base,source=/var/cache/apt,target=/var/cache/apt,sharing=locked \
346345
--mount=type=cache,from=apt-base,source=/var/lib/apt/lists,target=/var/lib/apt/lists,sharing=locked \
347346
DEBIAN_FRONTEND=noninteractive apt-get install -y \
348347
g++-aarch64-linux-gnu \
349-
g++-arm-linux-gnueabihf \
350348
gcc-aarch64-linux-gnu \
351-
gcc-arm-linux-gnueabihf \
352-
libc6-dev-arm64-cross \
353-
libc6-dev-armhf-cross
349+
libc6-dev-arm64-cross
354350

355351
##
356352
## Devcontainer
@@ -383,7 +379,6 @@ RUN --mount=type=cache,from=apt-base,source=/etc/apt,target=/etc/apt,ro \
383379
# Link the gnu versions of ranlib to the musl toolchain.
384380
# See: https://github.com/linkerd/linkerd2/issues/13350
385381
RUN ln -s /usr/bin/aarch64-linux-gnu-ranlib /usr/bin/aarch64-linux-musl-ranlib && \
386-
ln -s /usr/bin/arm-linux-gnueabihf-ranlib /usr/bin/arm-linux-musl-ranlib && \
387382
ln -s /usr/bin/x86_64-linux-gnu-ranlib /usr/bin/x86_64-linux-musl-ranlib
388383

389384
RUN sed -i 's/^# *\(en_US.UTF-8\)/\1/' /etc/locale.gen \

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ jobs:
151151
The `rust` container provides a Rust toolchain and associated utilities needed
152152
to build and test Rust code. The `rust-musl` container provides the same
153153
toolchain, but with the `musl` target installed with cross-compilation support
154-
for arm64 and armv7.
154+
for arm64.
155155

156156
### Rust in GitHub Actions
157157

bin/just-cargo

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ _target := if target == '' {
2020

2121
export RUSTFLAGS := env_var_or_default("RUSTFLAGS", "-D warnings") + if target == 'aarch64-unknown-linux-musl' {
2222
' --codegen linker=aarch64-linux-gnu-gcc'
23-
} else if target == 'armv7-unknown-linux-musleabihf' {
24-
' --codegen linker=arm-linux-gnueabihf-gcc'
2523
} else { '' }
2624

2725
_llvm-version := '19'
@@ -46,20 +44,6 @@ export CFLAGS_aarch64_unknown_linux_musl := '--sysroot=/usr/aarch64-linux-gnu'
4644
export STRIP_aarch64_unknown_linux_musl := _strip
4745
export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_RUSTFLAGS := _rustflags-self-contained
4846

49-
# linux/arm/v7 + gnueabihf
50-
export AR_armv7_unknown_linux_gnueabihf := _ar
51-
export CC_armv7_unknown_linux_gnueabihf := _clang
52-
export CFLAGS_armv7_unknown_linux_gnueabihf := '--sysroot=/usr/arm-linux-gnueabihf'
53-
export STRIP_armv7_unknown_linux_gnueabihf := _strip
54-
export CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER := 'arm-linux-gnueabihf-gcc'
55-
56-
# linux/arm/v7 + musl
57-
export AR_armv7_unknown_linux_musleabihf := _ar
58-
export CC_armv7_unknown_linux_musleabihf := _clang
59-
export CFLAGS_armv7_unknown_linux_musleabihf := '--sysroot=/usr/arm-linux-gnueabihf'
60-
export STRIP_armv7_unknown_linux_musleabihf := _strip
61-
export CARGO_TARGET_ARMV7_UNKNOWN_LINUX_MUSLEABIHF_RUSTFLAGS := _rustflags-self-contained
62-
6347
# linux/amd64 + gnu
6448
export AR_x86_64_unknown_linux_gnu := _ar
6549
export CC_x86_64_unknown_linux_gnu := _clang

0 commit comments

Comments
 (0)