Merge pull request #4568 from tgross35/ci-cleanup

ci: Clean up unused code

Author: tgross35

.editorconfig

@@ -0,0 +1,7 @@
+[*.sh]
+# See https://github.com/mvdan/sh/blob/master/cmd/shfmt/shfmt.1.scd#examples
+indent_style = space
+indent_size = 4
+
+switch_case_indent = true
+space_redirects = true

ci/android-install-sdk.sh

@@ -15,27 +15,27 @@ wget -q --tries=20 "https://dl.google.com/android/repository/commandlinetools-li
 unzip -q -d sdk/cmdline-tools "commandlinetools-linux-${sdk}_latest.zip"
 
 case "$1" in
-  arm | armv7)
-    api=24
-    image="system-images;android-${api};default;armeabi-v7a"
-    ;;
-  aarch64)
-    api=24
-    image="system-images;android-${api};google_apis;arm64-v8a"
-    ;;
-  i686)
-    api=28
-    image="system-images;android-${api};default;x86"
-    ;;
-  x86_64)
-    api=28
-    image="system-images;android-${api};default;x86_64"
-    ;;
-  *)
-    echo "invalid arch: $1"
-    exit 1
-    ;;
-esac;
+    arm | armv7)
+        api=24
+        image="system-images;android-${api};default;armeabi-v7a"
+        ;;
+    aarch64)
+        api=24
+        image="system-images;android-${api};google_apis;arm64-v8a"
+        ;;
+    i686)
+        api=28
+        image="system-images;android-${api};default;x86"
+        ;;
+    x86_64)
+        api=28
+        image="system-images;android-${api};default;x86_64"
+        ;;
+    *)
+        echo "invalid arch: $1"
+        exit 1
+        ;;
+esac
 
 # Try to fix warning about missing file.
 # See https://askubuntu.com/a/1078784
@@ -53,9 +53,9 @@ echo '#Fri Nov 03 10:11:27 CET 2017 count=0' >> /root/.android/repositories.cfg
 # which produces an insane amount of output.
 yes | ./sdk/cmdline-tools/tools/bin/sdkmanager --licenses --no_https | grep -v = || true
 yes | ./sdk/cmdline-tools/tools/bin/sdkmanager --no_https \
-        "platform-tools" \
-        "platforms;android-${api}" \
-        "${image}" | grep -v = || true
+    "platform-tools" \
+    "platforms;android-${api}" \
+    "${image}" | grep -v = || true
 
 # The newer emulator versions (31.3.12 or higher) fail to a valid AVD and the test gets stuck.
 # Until we figure out why, we use the older version (31.3.11).

ci/docker/switch/Dockerfile

@@ -25,14 +25,14 @@ case ${1} in
         musl_arch=aarch64
         kernel_arch=arm64
         CC=aarch64-linux-gnu-gcc \
-          ./configure --prefix="/musl-${musl_arch}" --enable-wrapper=yes
+            ./configure --prefix="/musl-${musl_arch}" --enable-wrapper=yes
         make install -j4
         ;;
     arm)
         musl_arch=arm
         kernel_arch=arm
         CC=arm-linux-gnueabihf-gcc CFLAGS="-march=armv6 -marm -mfpu=vfp" \
-          ./configure --prefix="/musl-${musl_arch}" --enable-wrapper=yes
+            ./configure --prefix="/musl-${musl_arch}" --enable-wrapper=yes
         make install -j4
         ;;
     i686)
@@ -43,7 +43,7 @@ case ${1} in
         # Specifically pass -m32 in CFLAGS and override CC when running
         # ./configure, since otherwise the script will fail to find a compiler.
         CC=gcc CFLAGS="-m32" \
-          ./configure --prefix="/musl-${musl_arch}" --disable-shared --target=i686
+            ./configure --prefix="/musl-${musl_arch}" --disable-shared --target=i686
         # unset CROSS_COMPILE when running make; otherwise the makefile will
         # call the non-existent binary 'i686-ar'.
         make CROSS_COMPILE= install -j4
@@ -58,21 +58,21 @@ case ${1} in
         musl_arch=s390x
         kernel_arch=s390
         CC=s390x-linux-gnu-gcc \
-          ./configure --prefix="/musl-${musl_arch}" --enable-wrapper=yes
+            ./configure --prefix="/musl-${musl_arch}" --enable-wrapper=yes
         make install -j4
         ;;
     loongarch64)
         musl_arch=loongarch64
         kernel_arch=loongarch
         CC=loongarch64-linux-gnu-gcc-14 \
-          ./configure --prefix="/musl-${musl_arch}" --enable-wrapper=yes
+            ./configure --prefix="/musl-${musl_arch}" --enable-wrapper=yes
         make install -j4
         ;;
     powerpc64*)
         musl_arch=powerpc64
         kernel_arch=powerpc
         CC="${1}-linux-gnu-gcc" CFLAGS="-mlong-double-64" \
-          ./configure --prefix="/musl-${musl_arch}" --enable-wrapper=yes
+            ./configure --prefix="/musl-${musl_arch}" --enable-wrapper=yes
         make install -j4
         ;;
     *)
@@ -81,7 +81,6 @@ case ${1} in
         ;;
 esac
 
-
 # shellcheck disable=SC2103
 cd ..
 rm -rf "$musl"
@@ -123,8 +122,8 @@ EOF
         base=$(basename "$url")
         curl --retry 5 -L "$url" > "$base"
         case $base in
-            linux-*) kernel=$base;;
-            patch-*) patch=$base;;
+            linux-*) kernel=$base ;;
+            patch-*) patch=$base ;;
         esac
         # Check if file is known
         grep -o "$base" alpine-sha512sums

ci/install-musl.sh

@@ -9,9 +9,9 @@ toolchain="${TOOLCHAIN:-nightly}"
 os="${OS:-}"
 
 case "$(uname -s)" in
-    Linux*)     os=linux ;;
-    Darwin*)    os=macos ;;
-    MINGW*)     os=windows ;;
+    Linux*) os=linux ;;
+    Darwin*) os=macos ;;
+    MINGW*) os=windows ;;
     *)
         echo "Unknown system $(uname -s)"
         exit 1
@@ -51,7 +51,7 @@ if [ "$os" = "windows" ]; then
 
     if [ -n "${ARCH_BITS:-}" ]; then
         echo "Fix MinGW"
-        for i in crt2.o dllcrt2.o libmingwex.a libmsvcrt.a ; do
+        for i in crt2.o dllcrt2.o libmingwex.a libmsvcrt.a; do
             cp -f "/C/ProgramData/Chocolatey/lib/mingw/tools/install/mingw$ARCH_BITS/$ARCH-w64-mingw32/lib/$i" "$(rustc --print sysroot)/lib/rustlib/$TARGET/lib"
         done
     fi
@@ -71,6 +71,6 @@ until [ $n -ge $N ]; do
         break
     fi
 
-    n=$((n+1))
+    n=$((n + 1))
     sleep 1
 done

ci/install-rust.sh

@@ -21,7 +21,7 @@ echo "${HOME}"
 pwd
 
 # Avoid "no space left on device" failure if running in CI
-if [ "${CI:-0}" != "0" ] && [ "$target" = "aarch64-linux-android" ] ; then
+if [ "${CI:-0}" != "0" ] && [ "$target" = "aarch64-linux-android" ]; then
     docker system prune -af
     docker system df
 fi
@@ -58,48 +58,11 @@ run() {
         sh -c "HOME=/tmp PATH=\$PATH:/rust/bin exec ci/run.sh $target"
 }
 
-build_switch() {
-    echo "Building docker container for target switch"
-
-    # use -f so we can use ci/ as build context
-    docker build -t libc-switch -f "ci/docker/switch/Dockerfile" ci/
-    mkdir -p target
-    if [ -w /dev/kvm ]; then
-        kvm="--volume /dev/kvm:/dev/kvm"
-    else
-        kvm=""
-    fi
-
-    cp "$(command -v rustup)" "$(rustc --print sysroot)/bin"
-
-    docker run \
-        --rm \
-        --user "$(id -u)":"$(id -g)" \
-        --env LIBC_CI \
-        --env CARGO_HOME=/cargo \
-        --env CARGO_TARGET_DIR=/checkout/target \
-        --volume "$CARGO_HOME":/cargo \
-        --volume "$(rustc --print sysroot)":/rust:ro \
-        --volume "$(pwd)":/checkout:ro \
-        --volume "$(pwd)"/target:/checkout/target \
-        --volume ~/.rustup:/.rustup:Z \
-        $kvm \
-        --init \
-        --workdir /checkout \
-        libc-switch \
-        sh -c "HOME=/tmp RUSTUP_HOME=/tmp PATH=\$PATH:/rust/bin rustup default nightly \
-            && rustup component add rust-src --target ci/switch.json \
-            && cargo build -Z build-std=core,alloc --target ci/switch.json"
-}
-
 if [ -z "$target" ]; then
+    # Run all docker targets
     for d in ci/docker/*; do
         run "${d}"
     done
 else
-    if [ "$target" != "switch" ]; then
-        run "$target"
-    else
-        build_switch
-    fi
+    run "$target"
 fi

ci/run-docker.sh

@@ -19,12 +19,12 @@ case "$target" in
     *android*) cmd="$cmd --manifest-path libc-test/Cargo.toml" ;;
     *s390x*) cmd="$cmd --manifest-path libc-test/Cargo.toml" ;;
     # For all other platforms, test everything in the workspace
-    *) cmd="$cmd --workspace"
+    *) cmd="$cmd --workspace" ;;
 esac
 
 # garando_errors only compiles on `cfg(any(unix, windows))`
 case "$target" in
-    *wasm*) cmd="$cmd --exclude ctest --exclude ctest-test --exclude ctest-next"
+    *wasm*) cmd="$cmd --exclude ctest --exclude ctest-test --exclude ctest-next" ;;
 esac
 
 if [ "$target" = "s390x-unknown-linux-gnu" ]; then
@@ -37,13 +37,13 @@ if [ "$target" = "s390x-unknown-linux-gnu" ]; then
         if [ "$passed" = "0" ]; then
             # shellcheck disable=SC2086
             if $cmd --no-default-features -- $test_flags; then
-                passed=$((passed+1))
+                passed=$((passed + 1))
                 continue
             fi
         elif [ "$passed" = "1" ]; then
             # shellcheck disable=SC2086
             if $cmd -- $test_flags; then
-                passed=$((passed+1))
+                passed=$((passed + 1))
                 continue
             fi
         elif [ "$passed" = "2" ]; then
@@ -52,7 +52,7 @@ if [ "$target" = "s390x-unknown-linux-gnu" ]; then
                 break
             fi
         fi
-        n=$((n+1))
+        n=$((n + 1))
         sleep 1
     done
 else