about summary refs log tree commit diff
path: root/src/ci/docker
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2025-07-03 07:23:17 +0000
committerbors <bors@rust-lang.org>2025-07-03 07:23:17 +0000
commitd6120810e56387730b2e86115471354c8084ca4a (patch)
treeb3a66ba3dd093daf12fffadced3fc5a3084c0996 /src/ci/docker
parent6268d0aa34b46981533b09827c1454b8cf27e032 (diff)
parent6671d9b92a0bfd70b42e6332c06cd3eeecb52b32 (diff)
downloadrust-d6120810e56387730b2e86115471354c8084ca4a.tar.gz
rust-d6120810e56387730b2e86115471354c8084ca4a.zip
Auto merge of #143294 - ChrisDenton:rename-mingw, r=Kobzol
Rename `mingw-*` CI jobs to `pr-*`

The name `mingw` confuses people because these CI jobs now do much more than just cross-compile to mingw.

This is basically a find/replace. I chose the name `pr-` because it's job is to do general PR checks,
Diffstat (limited to 'src/ci/docker')
-rw-r--r--src/ci/docker/host-x86_64/mingw-check-1/Dockerfile58
-rw-r--r--src/ci/docker/host-x86_64/pr-check-1/Dockerfile58
-rwxr-xr-xsrc/ci/docker/host-x86_64/pr-check-1/check-default-config-profiles.sh (renamed from src/ci/docker/host-x86_64/mingw-check-1/check-default-config-profiles.sh)0
-rw-r--r--src/ci/docker/host-x86_64/pr-check-1/reuse-requirements.in (renamed from src/ci/docker/host-x86_64/mingw-check-1/reuse-requirements.in)0
-rw-r--r--src/ci/docker/host-x86_64/pr-check-1/reuse-requirements.txt (renamed from src/ci/docker/host-x86_64/mingw-check-1/reuse-requirements.txt)0
-rwxr-xr-xsrc/ci/docker/host-x86_64/pr-check-1/validate-toolstate.sh (renamed from src/ci/docker/host-x86_64/mingw-check-1/validate-toolstate.sh)0
-rw-r--r--src/ci/docker/host-x86_64/pr-check-2/Dockerfile (renamed from src/ci/docker/host-x86_64/mingw-check-2/Dockerfile)0
-rw-r--r--src/ci/docker/host-x86_64/tidy/Dockerfile (renamed from src/ci/docker/host-x86_64/mingw-check-tidy/Dockerfile)12
-rw-r--r--src/ci/docker/host-x86_64/tidy/eslint.version (renamed from src/ci/docker/host-x86_64/mingw-check-tidy/eslint.version)0
9 files changed, 64 insertions, 64 deletions
diff --git a/src/ci/docker/host-x86_64/mingw-check-1/Dockerfile b/src/ci/docker/host-x86_64/mingw-check-1/Dockerfile
deleted file mode 100644
index c46a2471e75..00000000000
--- a/src/ci/docker/host-x86_64/mingw-check-1/Dockerfile
+++ /dev/null
@@ -1,58 +0,0 @@
-FROM ubuntu:22.04
-
-ARG DEBIAN_FRONTEND=noninteractive
-RUN apt-get update && apt-get install -y --no-install-recommends \
-  g++ \
-  make \
-  ninja-build \
-  file \
-  curl \
-  ca-certificates \
-  python3 \
-  python3-pip \
-  python3-pkg-resources \
-  git \
-  cmake \
-  sudo \
-  gdb \
-  xz-utils \
-  libssl-dev \
-  pkg-config \
-  mingw-w64 \
-  && rm -rf /var/lib/apt/lists/*
-
-ENV RUST_CONFIGURE_ARGS="--set rust.validate-mir-opts=3"
-
-COPY scripts/nodejs.sh /scripts/
-RUN sh /scripts/nodejs.sh /node
-ENV PATH="/node/bin:${PATH}"
-
-# Install es-check
-# Pin its version to prevent unrelated CI failures due to future es-check versions.
-RUN npm install es-check@6.1.1 eslint@8.6.0 typescript@5.7.3 -g
-
-COPY scripts/sccache.sh /scripts/
-RUN sh /scripts/sccache.sh
-
-COPY host-x86_64/mingw-check-1/reuse-requirements.txt /tmp/
-RUN pip3 install --no-deps --no-cache-dir --require-hashes -r /tmp/reuse-requirements.txt
-
-COPY host-x86_64/mingw-check-1/check-default-config-profiles.sh /scripts/
-COPY host-x86_64/mingw-check-1/validate-toolstate.sh /scripts/
-
-# Check library crates on all tier 1 targets.
-# We disable optimized compiler built-ins because that requires a C toolchain for the target.
-# We also skip the x86_64-unknown-linux-gnu target as it is well-tested by other jobs.
-ENV SCRIPT \
-           /scripts/check-default-config-profiles.sh && \
-           python3 ../x.py build --stage 1 src/tools/build-manifest && \
-           python3 ../x.py test --stage 0 src/tools/compiletest && \
-           python3 ../x.py check compiletest --set build.compiletest-use-stage0-libtest=true && \
-           python3 ../x.py check --stage 1 --target=i686-pc-windows-gnu --host=i686-pc-windows-gnu && \
-           python3 ../x.py check --stage 1 --set build.optimized-compiler-builtins=false core alloc std --target=aarch64-unknown-linux-gnu,i686-pc-windows-msvc,i686-unknown-linux-gnu,x86_64-apple-darwin,x86_64-pc-windows-gnu,x86_64-pc-windows-msvc && \
-           /scripts/validate-toolstate.sh && \
-           reuse --include-submodules lint && \
-           python3 ../x.py test collect-license-metadata && \
-           # Runs checks to ensure that there are no issues in our JS code.
-           es-check es2019 ../src/librustdoc/html/static/js/*.js && \
-           tsc --project ../src/librustdoc/html/static/js/tsconfig.json
diff --git a/src/ci/docker/host-x86_64/pr-check-1/Dockerfile b/src/ci/docker/host-x86_64/pr-check-1/Dockerfile
new file mode 100644
index 00000000000..7a8056b70dc
--- /dev/null
+++ b/src/ci/docker/host-x86_64/pr-check-1/Dockerfile
@@ -0,0 +1,58 @@
+FROM ubuntu:22.04
+
+ARG DEBIAN_FRONTEND=noninteractive
+RUN apt-get update && apt-get install -y --no-install-recommends \
+  g++ \
+  make \
+  ninja-build \
+  file \
+  curl \
+  ca-certificates \
+  python3 \
+  python3-pip \
+  python3-pkg-resources \
+  git \
+  cmake \
+  sudo \
+  gdb \
+  xz-utils \
+  libssl-dev \
+  pkg-config \
+  mingw-w64 \
+  && rm -rf /var/lib/apt/lists/*
+
+ENV RUST_CONFIGURE_ARGS="--set rust.validate-mir-opts=3"
+
+COPY scripts/nodejs.sh /scripts/
+RUN sh /scripts/nodejs.sh /node
+ENV PATH="/node/bin:${PATH}"
+
+# Install es-check
+# Pin its version to prevent unrelated CI failures due to future es-check versions.
+RUN npm install es-check@6.1.1 eslint@8.6.0 typescript@5.7.3 -g
+
+COPY scripts/sccache.sh /scripts/
+RUN sh /scripts/sccache.sh
+
+COPY host-x86_64/pr-check-1/reuse-requirements.txt /tmp/
+RUN pip3 install --no-deps --no-cache-dir --require-hashes -r /tmp/reuse-requirements.txt
+
+COPY host-x86_64/pr-check-1/check-default-config-profiles.sh /scripts/
+COPY host-x86_64/pr-check-1/validate-toolstate.sh /scripts/
+
+# Check library crates on all tier 1 targets.
+# We disable optimized compiler built-ins because that requires a C toolchain for the target.
+# We also skip the x86_64-unknown-linux-gnu target as it is well-tested by other jobs.
+ENV SCRIPT \
+  /scripts/check-default-config-profiles.sh && \
+  python3 ../x.py build --stage 1 src/tools/build-manifest && \
+  python3 ../x.py test --stage 0 src/tools/compiletest && \
+  python3 ../x.py check compiletest --set build.compiletest-use-stage0-libtest=true && \
+  python3 ../x.py check --stage 1 --target=i686-pc-windows-gnu --host=i686-pc-windows-gnu && \
+  python3 ../x.py check --stage 1 --set build.optimized-compiler-builtins=false core alloc std --target=aarch64-unknown-linux-gnu,i686-pc-windows-msvc,i686-unknown-linux-gnu,x86_64-apple-darwin,x86_64-pc-windows-gnu,x86_64-pc-windows-msvc && \
+  /scripts/validate-toolstate.sh && \
+  reuse --include-submodules lint && \
+  python3 ../x.py test collect-license-metadata && \
+  # Runs checks to ensure that there are no issues in our JS code.
+  es-check es2019 ../src/librustdoc/html/static/js/*.js && \
+  tsc --project ../src/librustdoc/html/static/js/tsconfig.json
diff --git a/src/ci/docker/host-x86_64/mingw-check-1/check-default-config-profiles.sh b/src/ci/docker/host-x86_64/pr-check-1/check-default-config-profiles.sh
index 0c85d4b449d..0c85d4b449d 100755
--- a/src/ci/docker/host-x86_64/mingw-check-1/check-default-config-profiles.sh
+++ b/src/ci/docker/host-x86_64/pr-check-1/check-default-config-profiles.sh
diff --git a/src/ci/docker/host-x86_64/mingw-check-1/reuse-requirements.in b/src/ci/docker/host-x86_64/pr-check-1/reuse-requirements.in
index d7c2d3fde5b..d7c2d3fde5b 100644
--- a/src/ci/docker/host-x86_64/mingw-check-1/reuse-requirements.in
+++ b/src/ci/docker/host-x86_64/pr-check-1/reuse-requirements.in
diff --git a/src/ci/docker/host-x86_64/mingw-check-1/reuse-requirements.txt b/src/ci/docker/host-x86_64/pr-check-1/reuse-requirements.txt
index 8784e18864b..8784e18864b 100644
--- a/src/ci/docker/host-x86_64/mingw-check-1/reuse-requirements.txt
+++ b/src/ci/docker/host-x86_64/pr-check-1/reuse-requirements.txt
diff --git a/src/ci/docker/host-x86_64/mingw-check-1/validate-toolstate.sh b/src/ci/docker/host-x86_64/pr-check-1/validate-toolstate.sh
index a5691da8cda..a5691da8cda 100755
--- a/src/ci/docker/host-x86_64/mingw-check-1/validate-toolstate.sh
+++ b/src/ci/docker/host-x86_64/pr-check-1/validate-toolstate.sh
diff --git a/src/ci/docker/host-x86_64/mingw-check-2/Dockerfile b/src/ci/docker/host-x86_64/pr-check-2/Dockerfile
index ce18a181d31..ce18a181d31 100644
--- a/src/ci/docker/host-x86_64/mingw-check-2/Dockerfile
+++ b/src/ci/docker/host-x86_64/pr-check-2/Dockerfile
diff --git a/src/ci/docker/host-x86_64/mingw-check-tidy/Dockerfile b/src/ci/docker/host-x86_64/tidy/Dockerfile
index 62cd8a31212..dbb950cbe0c 100644
--- a/src/ci/docker/host-x86_64/mingw-check-tidy/Dockerfile
+++ b/src/ci/docker/host-x86_64/tidy/Dockerfile
@@ -1,5 +1,5 @@
 # We use the ghcr base image because ghcr doesn't have a rate limit
-# and the mingw-check-tidy job doesn't cache docker images in CI.
+# and the tidy job doesn't cache docker images in CI.
 FROM ghcr.io/rust-lang/ubuntu:22.04
 
 ARG DEBIAN_FRONTEND=noninteractive
@@ -29,20 +29,20 @@ RUN sh /scripts/nodejs.sh /node
 ENV PATH="/node/bin:${PATH}"
 
 # Install eslint
-COPY host-x86_64/mingw-check-tidy/eslint.version /tmp/
+COPY host-x86_64/tidy/eslint.version /tmp/
 
 COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh
 
-COPY host-x86_64/mingw-check-1/reuse-requirements.txt /tmp/
+COPY host-x86_64/pr-check-1/reuse-requirements.txt /tmp/
 RUN pip3 install --no-deps --no-cache-dir --require-hashes -r /tmp/reuse-requirements.txt \
-    && pip3 install virtualenv
+  && pip3 install virtualenv
 
-COPY host-x86_64/mingw-check-1/validate-toolstate.sh /scripts/
+COPY host-x86_64/pr-check-1/validate-toolstate.sh /scripts/
 
 RUN bash -c 'npm install -g eslint@$(cat /tmp/eslint.version)'
 
 # NOTE: intentionally uses python2 for x.py so we can test it still works.
 # validate-toolstate only runs in our CI, so it's ok for it to only support python3.
 ENV SCRIPT TIDY_PRINT_DIFF=1 python2.7 ../x.py test --stage 0 \
-    src/tools/tidy tidyselftest --extra-checks=py,cpp
+  src/tools/tidy tidyselftest --extra-checks=py,cpp
diff --git a/src/ci/docker/host-x86_64/mingw-check-tidy/eslint.version b/src/ci/docker/host-x86_64/tidy/eslint.version
index 1acea15afd6..1acea15afd6 100644
--- a/src/ci/docker/host-x86_64/mingw-check-tidy/eslint.version
+++ b/src/ci/docker/host-x86_64/tidy/eslint.version