ci: Require specifying version in install-musl.sh

Getting this information from an env has been problematic since `docker
build` doesn't pass the environment. Switch to expecting an explicit arg
and fail if unset, so we don't accidentally regress.

With this change, new musl tests are correctly getting run in CI.

Author: tgross35

ci/docker/aarch64-unknown-linux-musl/Dockerfile

@@ -13,8 +13,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     rsync \
     xz-utils
 
+ARG MUSL_VERSION
 COPY install-musl.sh /
-RUN /install-musl.sh aarch64
+RUN /install-musl.sh aarch64 "$MUSL_VERSION"
 
 # FIXME: shouldn't need the `-lgcc` here, shouldn't that be in std?
 ENV PATH=$PATH:/musl-aarch64/bin:/rust/bin \

ci/docker/arm-unknown-linux-musleabihf/Dockerfile

@@ -16,8 +16,9 @@ RUN sed -i -E 's/(archive|security)\.ubuntu\.com/old-releases.ubuntu.com/g' \
         rsync \
         xz-utils
 
+ARG MUSL_VERSION
 COPY install-musl.sh /
-RUN /install-musl.sh arm
+RUN /install-musl.sh arm "$MUSL_VERSION"
 
 ENV PATH=$PATH:/musl-arm/bin:/rust/bin \
     CC_arm_unknown_linux_musleabihf=musl-gcc \

ci/docker/i686-unknown-linux-musl/Dockerfile

@@ -16,8 +16,9 @@ RUN sed -i -E 's/(archive|security)\.ubuntu\.com/old-releases.ubuntu.com/g' \
         rsync \
         xz-utils
 
+ARG MUSL_VERSION
 COPY install-musl.sh /
-RUN /install-musl.sh i686
+RUN /install-musl.sh i686 "$MUSL_VERSION"
 
 ENV PATH=$PATH:/musl-i686/bin:/rust/bin \
     CC_i686_unknown_linux_musl=musl-gcc \

ci/docker/loongarch64-unknown-linux-musl/Dockerfile

@@ -13,8 +13,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     rsync \
     xz-utils
 
+ARG MUSL_VERSION
 COPY install-musl.sh /
-RUN /install-musl.sh loongarch64
+RUN /install-musl.sh loongarch64 "$MUSL_VERSION"
 
 ENV CARGO_TARGET_LOONGARCH64_UNKNOWN_LINUX_MUSL_LINKER=musl-gcc \
     CARGO_TARGET_LOONGARCH64_UNKNOWN_LINUX_MUSL_RUNNER="qemu-loongarch64" \

ci/docker/powerpc64le-unknown-linux-musl/Dockerfile

@@ -13,8 +13,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     rsync \
     xz-utils
 
+ARG MUSL_VERSION
 COPY install-musl.sh /
-RUN /install-musl.sh powerpc64le
+RUN /install-musl.sh powerpc64le "$MUSL_VERSION"
 
 # FIXME: shouldn't need the `-lgcc` here, shouldn't that be in std?
 ENV PATH=$PATH:/musl-powerpc64/bin:/rust/bin \

ci/docker/s390x-unknown-linux-musl/Dockerfile

@@ -10,8 +10,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     patch \
     rsync
 
+ARG MUSL_VERSION
 COPY install-musl.sh /
-RUN /install-musl.sh s390x
+RUN /install-musl.sh s390x "$MUSL_VERSION"
 
 # FIXME: shouldn't need the `-lgcc` here, shouldn't that be in std?
 ENV CARGO_TARGET_S390X_UNKNOWN_LINUX_GNU_LINKER=s390x-linux-gnu-gcc \

ci/docker/x86_64-unknown-linux-musl/Dockerfile

@@ -11,8 +11,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     rsync \
     xz-utils
 
+ARG MUSL_VERSION
 COPY install-musl.sh /
-RUN /install-musl.sh x86_64
+RUN /install-musl.sh x86_64 "$MUSL_VERSION"
 
 ENV PATH=$PATH:/musl-x86_64/bin:/rust/bin \
     RUSTFLAGS="-L /musl-x86_64/lib"

ci/install-musl.sh

@@ -5,15 +5,22 @@
 
 set -eux
 
+arch="$1"
+version="$2"
 old_musl=1.1.24
 new_musl=1.2.5
 
-case ${1} in
+case "$arch" in
     loongarch64) musl_version="$new_musl" ;;
     *)
-        [ -n "${RUST_LIBC_UNSTABLE_MUSL_V1_2_3:-}" ] &&
-            musl_version="$new_musl" ||
-            musl_version="$old_musl"
+        case "$version" in
+            old) musl_version="$old_musl" ;;
+            new) musl_version="$new_musl" ;;
+            *)
+                echo "musl version must be set to either 'old' or 'new'"
+                exit 1
+                ;;
+        esac
         ;;
 esac
 

ci/prep-semver-baseline.sh

@@ -21,7 +21,7 @@ fi
 # Find the most recent version matching a pattern.
 version=$(
     echo "$index" |
-    jq -er --slurp --arg pat "$pat" '
+        jq -er --slurp --arg pat "$pat" '
         map(select(.vers | test($pat)))
         | last
         | debug("version:", .)

ci/run-docker.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Disable SC2086 as it confuses the docker command.
 # shellcheck disable=SC2086
@@ -27,10 +27,26 @@ if [ "${CI:-0}" != "0" ] && [ "$target" = "aarch64-linux-android" ]; then
 fi
 
 run() {
-    echo "Building docker container for target $target"
+    run_target="$1"
+    echo "Building docker container for target $run_target"
+
+    build_args=(
+        "--tag=libc-$run_target"
+        "--file=ci/docker/$run_target/Dockerfile"
+        "ci/"
+    )
+
+    if [[ "$run_target" = *"musl"* ]]; then
+        if [ -n "${RUST_LIBC_UNSTABLE_MUSL_V1_2_3:-}" ]; then
+            build_args+=("--build-arg=MUSL_VERSION=new")
+        else
+            build_args+=("--build-arg=MUSL_VERSION=old")
+        fi
+    fi
 
     # use -f so we can use ci/ as build context
-    docker build -t "libc-$target" -f "ci/docker/$target/Dockerfile" ci/
+    docker build "${build_args[@]}"
+
     mkdir -p target
     if [ -w /dev/kvm ]; then
         kvm="--volume /dev/kvm:/dev/kvm"