From 1630a4622130d562bcb4cc0265b9d8b1494ce2fd Mon Sep 17 00:00:00 2001 From: Earlopain <14981592+Earlopain@users.noreply.github.com> Date: Tue, 6 May 2025 13:42:23 +0200 Subject: [PATCH] Remove `.rust.version` check All versions are build with rust, so it is always present --- Dockerfile.template | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Dockerfile.template b/Dockerfile.template index 9c7729809..9f9a68542 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -113,7 +113,6 @@ RUN set -eux; \ {{ ) else "" end -}} ; \ {{ ) end -}} -{{ if .rust.version then ( -}} \ rustArch=; \ {{ def archVar: if is_alpine then "apkArch" else "dpkgArch" end -}} @@ -181,7 +180,6 @@ RUN set -eux; \ rustc --version; \ cargo --version; \ fi; \ -{{ ) else "" end -}} \ wget -O ruby.tar.xz "$RUBY_DOWNLOAD_URL"; \ echo "$RUBY_DOWNLOAD_SHA256 *ruby.tar.xz" | sha256sum --check --strict; \ @@ -208,16 +206,12 @@ RUN set -eux; \ --build="$gnuArch" \ --disable-install-doc \ --enable-shared \ -{{ if .rust.version then ( -}} ${rustArch:+--enable-yjit} \ -{{ ) else "" end -}} ; \ make -j "$(nproc)"; \ make install; \ \ -{{ if .rust.version then ( -}} rm -rf /tmp/rust; \ -{{ ) else "" end -}} {{ if is_alpine then ( -}} runDeps="$( \ scanelf --needed --nobanner --format '%n#p' --recursive /usr/local \