Trials: Shotgunning

rust-lang · Dec 18, 2024 · 1f36687 · 1f36687
1 parent bc08593
commit 1f36687
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 28 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -65,8 +65,8 @@ jobs:
           os: ubuntu-latest
         - tuple: x86_64-unknown-linux-gnu
           os: ubuntu-latest
-        - tuple: x86_64-unknown-linux-gnu-emulated
-          os: ubuntu-latest
+#        - tuple: x86_64-unknown-linux-gnu-emulated
+#          os: ubuntu-latest
         - tuple: arm-unknown-linux-gnueabihf
           os: ubuntu-latest
         - tuple: armv7-unknown-linux-gnueabihf
@@ -137,11 +137,11 @@ jobs:
 
         # Add additional variables to the matrix variations generated above using `include`:
         include:
-        - target:
-            tuple: x86_64-unknown-linux-gnu-emulated
-            os: ubuntu-latest
-          test_everything: true
-          rustflags: --cfg stdarch_intel_sde
+#        - target:
+#            tuple: x86_64-unknown-linux-gnu-emulated
+#            os: ubuntu-latest
+#          test_everything: true
+#          rustflags: --cfg stdarch_intel_sde
         # MIPS targets disabled since they are dropped to tier 3.
         # See https://github.com/rust-lang/compiler-team/issues/648
         #- target:
@@ -168,10 +168,10 @@ jobs:
             tuple: powerpc64-unknown-linux-gnu
             os: ubuntu-latest
           disable_assert_instr: true
-        - target:
-            tuple: powerpc64le-unknown-linux-gnu
-            os: ubuntu-latest
-          disable_assert_instr: true
+#        - target:
+#            tuple: powerpc64le-unknown-linux-gnu
+#            os: ubuntu-latest
+#          disable_assert_instr: true
         - target:
             tuple: aarch64-apple-darwin
             os: macos-latest

diff --git a/ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile b/ci/docker/armv7-unknown-linux-gnueabihf/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 RUN apt-get update && apt-get install -y --no-install-recommends \
   gcc \
   g++ \
@@ -10,8 +10,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   qemu-user \
   make \
   file \
-  clang-15 \
   lld
+
 ENV CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc \
     CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_RUNNER="qemu-arm -L /usr/arm-linux-gnueabihf" \
     OBJDUMP=arm-linux-gnueabihf-objdump
diff --git a/ci/run.sh b/ci/run.sh
@@ -139,21 +139,21 @@ case ${TARGET} in
 
 esac
 
-if [ "${TARGET}" = "aarch64-unknown-linux-gnu" ]; then
-    (
-        CPPFLAGS="-fuse-ld=lld -I/usr/aarch64-linux-gnu/include/ -I/usr/aarch64-linux-gnu/include/c++/9/aarch64-linux-gnu/" \
-            RUSTFLAGS="$HOST_RUSTFLAGS" \
-            RUST_LOG=warn \
-            cargo run ${INTRINSIC_TEST} "${PROFILE}" --bin intrinsic-test -- intrinsics_data/arm_intrinsics.json --runner "${CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUNNER}" --cppcompiler "clang++-15" --skip crates/intrinsic-test/missing_aarch64.txt
-    )
-elif [ "${TARGET}" = "armv7-unknown-linux-gnueabihf" ]; then
-    (
-        CPPFLAGS="-fuse-ld=lld -I/usr/arm-linux-gnueabihf/include/ -I/usr/arm-linux-gnueabihf/include/c++/9/arm-linux-gnueabihf/" \
-            RUSTFLAGS="$HOST_RUSTFLAGS" \
-            RUST_LOG=warn \
-            cargo run ${INTRINSIC_TEST} "${PROFILE}" --bin intrinsic-test -- intrinsics_data/arm_intrinsics.json --runner "${CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_RUNNER}" --cppcompiler "clang++-15" --skip crates/intrinsic-test/missing_arm.txt --a32
-    )
-fi
+#if [ "${TARGET}" = "aarch64-unknown-linux-gnu" ]; then
+#    (
+#        CPPFLAGS="-fuse-ld=lld -I/usr/aarch64-linux-gnu/include/ -I/usr/aarch64-linux-gnu/include/c++/9/aarch64-linux-gnu/" \
+#            RUSTFLAGS="$HOST_RUSTFLAGS" \
+#            RUST_LOG=warn \
+#            cargo run ${INTRINSIC_TEST} "${PROFILE}" --bin intrinsic-test -- intrinsics_data/arm_intrinsics.json --runner "${CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_RUNNER}" --cppcompiler "clang++-15" --skip crates/intrinsic-test/missing_aarch64.txt
+#    )
+#elif [ "${TARGET}" = "armv7-unknown-linux-gnueabihf" ]; then
+#    (
+#        CPPFLAGS="-fuse-ld=lld -I/usr/arm-linux-gnueabihf/include/ -I/usr/arm-linux-gnueabihf/include/c++/9/arm-linux-gnueabihf/" \
+#            RUSTFLAGS="$HOST_RUSTFLAGS" \
+#            RUST_LOG=warn \
+#            cargo run ${INTRINSIC_TEST} "${PROFILE}" --bin intrinsic-test -- intrinsics_data/arm_intrinsics.json --runner "${CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_RUNNER}" --cppcompiler "clang++-15" --skip crates/intrinsic-test/missing_arm.txt --a32
+#    )
+#fi
 
 if [ "$NORUN" != "1" ] && [ "$NOSTD" != 1 ]; then
     # Test examples