Skip to content

Commit d612081

Browse files
committed
Auto merge of rust-lang#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,
2 parents 6268d0a + 6671d9b commit d612081

File tree

16 files changed

+80
-81
lines changed

16 files changed

+80
-81
lines changed

.github/workflows/ghcr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ jobs:
5353
run: |
5454
# List of DockerHub images to mirror to ghcr.io
5555
images=(
56-
# Mirrored because used by the mingw-check-tidy, which doesn't cache Docker images
56+
# Mirrored because used by the tidy job, which doesn't cache Docker images
5757
"ubuntu:22.04"
58-
# Mirrored because used by all linux CI jobs, including mingw-check-tidy
58+
# Mirrored because used by all linux CI jobs, including tidy
5959
"moby/buildkit:buildx-stable-1"
6060
# Mirrored because used when CI is running inside a Docker container
6161
"alpine:3.4"

src/ci/citool/src/jobs.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use crate::utils::load_env_var;
1313
#[derive(serde::Deserialize, Debug, Clone)]
1414
#[serde(deny_unknown_fields)]
1515
pub struct Job {
16-
/// Name of the job, e.g. mingw-check-1
16+
/// Name of the job, e.g. pr-check-1
1717
pub name: String,
1818
/// GitHub runner on which the job should be executed
1919
pub os: String,

src/ci/citool/tests/jobs.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ try-job: dist-i686-msvc"#,
4040
fn pr_jobs() {
4141
let stdout = get_matrix("pull_request", "commit", "refs/heads/pr/1234");
4242
insta::assert_snapshot!(stdout, @r#"
43-
jobs=[{"name":"mingw-check-1","full_name":"PR - mingw-check-1","os":"ubuntu-24.04","env":{"PR_CI_JOB":1},"free_disk":true},{"name":"mingw-check-2","full_name":"PR - mingw-check-2","os":"ubuntu-24.04","env":{"PR_CI_JOB":1},"free_disk":true},{"name":"mingw-check-tidy","full_name":"PR - mingw-check-tidy","os":"ubuntu-24.04","env":{"PR_CI_JOB":1},"continue_on_error":true,"free_disk":true,"doc_url":"https://foo.bar"}]
43+
jobs=[{"name":"pr-check-1","full_name":"PR - pr-check-1","os":"ubuntu-24.04","env":{"PR_CI_JOB":1},"free_disk":true},{"name":"pr-check-2","full_name":"PR - pr-check-2","os":"ubuntu-24.04","env":{"PR_CI_JOB":1},"free_disk":true},{"name":"tidy","full_name":"PR - tidy","os":"ubuntu-24.04","env":{"PR_CI_JOB":1},"continue_on_error":true,"free_disk":true,"doc_url":"https://foo.bar"}]
4444
run_type=pr
4545
"#);
4646
}

src/ci/citool/tests/test-jobs.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@ envs:
6464
# These jobs automatically inherit envs.pr, to avoid repeating
6565
# it in each job definition.
6666
pr:
67-
- name: mingw-check-1
67+
- name: pr-check-1
6868
<<: *job-linux-4c
69-
- name: mingw-check-2
69+
- name: pr-check-2
7070
<<: *job-linux-4c
71-
- name: mingw-check-tidy
71+
- name: tidy
7272
continue_on_error: true
7373
doc_url: https://foo.bar
7474
<<: *job-linux-4c

src/ci/docker/host-x86_64/mingw-check-1/Dockerfile

Lines changed: 0 additions & 58 deletions
This file was deleted.
Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
FROM ubuntu:22.04
2+
3+
ARG DEBIAN_FRONTEND=noninteractive
4+
RUN apt-get update && apt-get install -y --no-install-recommends \
5+
g++ \
6+
make \
7+
ninja-build \
8+
file \
9+
curl \
10+
ca-certificates \
11+
python3 \
12+
python3-pip \
13+
python3-pkg-resources \
14+
git \
15+
cmake \
16+
sudo \
17+
gdb \
18+
xz-utils \
19+
libssl-dev \
20+
pkg-config \
21+
mingw-w64 \
22+
&& rm -rf /var/lib/apt/lists/*
23+
24+
ENV RUST_CONFIGURE_ARGS="--set rust.validate-mir-opts=3"
25+
26+
COPY scripts/nodejs.sh /scripts/
27+
RUN sh /scripts/nodejs.sh /node
28+
ENV PATH="/node/bin:${PATH}"
29+
30+
# Install es-check
31+
# Pin its version to prevent unrelated CI failures due to future es-check versions.
32+
RUN npm install es-check@6.1.1 eslint@8.6.0 typescript@5.7.3 -g
33+
34+
COPY scripts/sccache.sh /scripts/
35+
RUN sh /scripts/sccache.sh
36+
37+
COPY host-x86_64/pr-check-1/reuse-requirements.txt /tmp/
38+
RUN pip3 install --no-deps --no-cache-dir --require-hashes -r /tmp/reuse-requirements.txt
39+
40+
COPY host-x86_64/pr-check-1/check-default-config-profiles.sh /scripts/
41+
COPY host-x86_64/pr-check-1/validate-toolstate.sh /scripts/
42+
43+
# Check library crates on all tier 1 targets.
44+
# We disable optimized compiler built-ins because that requires a C toolchain for the target.
45+
# We also skip the x86_64-unknown-linux-gnu target as it is well-tested by other jobs.
46+
ENV SCRIPT \
47+
/scripts/check-default-config-profiles.sh && \
48+
python3 ../x.py build --stage 1 src/tools/build-manifest && \
49+
python3 ../x.py test --stage 0 src/tools/compiletest && \
50+
python3 ../x.py check compiletest --set build.compiletest-use-stage0-libtest=true && \
51+
python3 ../x.py check --stage 1 --target=i686-pc-windows-gnu --host=i686-pc-windows-gnu && \
52+
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 && \
53+
/scripts/validate-toolstate.sh && \
54+
reuse --include-submodules lint && \
55+
python3 ../x.py test collect-license-metadata && \
56+
# Runs checks to ensure that there are no issues in our JS code.
57+
es-check es2019 ../src/librustdoc/html/static/js/*.js && \
58+
tsc --project ../src/librustdoc/html/static/js/tsconfig.json

0 commit comments

Comments
 (0)