about summary refs log tree commit diff
path: root/src/ci
diff options
context:
space:
mode:
authorBen Kimock <kimockb@gmail.com>2025-01-23 19:08:37 -0500
committerBen Kimock <kimockb@gmail.com>2025-01-27 16:06:30 -0500
commit1f4309cec4462ea76a2c7a89fa0aff3d1782e60b (patch)
tree14b08ee4823b938e33089847f3a973961fc1db3d /src/ci
parent0df0662ee06bb8987e0cdbfae5634b1630d41236 (diff)
downloadrust-1f4309cec4462ea76a2c7a89fa0aff3d1782e60b.tar.gz
rust-1f4309cec4462ea76a2c7a89fa0aff3d1782e60b.zip
Fix 2/4 tests skipped by opt-dist
Diffstat (limited to 'src/ci')
-rw-r--r--src/ci/docker/host-aarch64/dist-aarch64-linux/Dockerfile1
-rw-r--r--src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile2
-rw-r--r--src/ci/github-actions/jobs.yml2
3 files changed, 4 insertions, 1 deletions
diff --git a/src/ci/docker/host-aarch64/dist-aarch64-linux/Dockerfile b/src/ci/docker/host-aarch64/dist-aarch64-linux/Dockerfile
index 6f33c632181..2b8a3f829c6 100644
--- a/src/ci/docker/host-aarch64/dist-aarch64-linux/Dockerfile
+++ b/src/ci/docker/host-aarch64/dist-aarch64-linux/Dockerfile
@@ -20,6 +20,7 @@ RUN yum upgrade -y && \
       gcc-c++ \
       git \
       glibc-devel \
+      glibc-static \
       libedit-devel \
       libstdc++-devel \
       make \
diff --git a/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile b/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile
index 3a396230582..0b4682ac32b 100644
--- a/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile
+++ b/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile
@@ -21,6 +21,8 @@ RUN yum upgrade -y && \
       git \
       glibc-devel.i686 \
       glibc-devel.x86_64 \
+      glibc-static.i686 \
+      glibc-static.x86_64 \
       libedit-devel \
       libstdc++-devel.i686 \
       libstdc++-devel.x86_64 \
diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml
index 7730d29d28f..4c4863e2b4b 100644
--- a/src/ci/github-actions/jobs.yml
+++ b/src/ci/github-actions/jobs.yml
@@ -86,7 +86,7 @@ envs:
     #   builds)
     # - not running `opt-dist`'s post-optimization smoke tests on the resulting toolchain
     #
-    # If you *want* these to happen however, temporarily uncomment it before triggering a try build.
+    # If you *want* these to happen however, temporarily comment it before triggering a try build.
     DIST_TRY_BUILD: 1
 
   auto: