Skip to content

Commit 6671d9b

Browse files
committed
Rename mingw-check-tidy to tidy
1 parent 62949cd commit 6671d9b

File tree

8 files changed

+10
-10
lines changed

8 files changed

+10
-10
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 pr-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 pr-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/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":"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":"pr-check-tidy","full_name":"PR - pr-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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ pr:
6868
<<: *job-linux-4c
6969
- name: pr-check-2
7070
<<: *job-linux-4c
71-
- name: pr-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/pr-check-tidy/Dockerfile renamed to src/ci/docker/host-x86_64/tidy/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# We use the ghcr base image because ghcr doesn't have a rate limit
2-
# and the pr-check-tidy job doesn't cache docker images in CI.
2+
# and the tidy job doesn't cache docker images in CI.
33
FROM ghcr.io/rust-lang/ubuntu:22.04
44

55
ARG DEBIAN_FRONTEND=noninteractive
@@ -29,7 +29,7 @@ RUN sh /scripts/nodejs.sh /node
2929
ENV PATH="/node/bin:${PATH}"
3030

3131
# Install eslint
32-
COPY host-x86_64/pr-check-tidy/eslint.version /tmp/
32+
COPY host-x86_64/tidy/eslint.version /tmp/
3333

3434
COPY scripts/sccache.sh /scripts/
3535
RUN sh /scripts/sccache.sh

src/ci/github-actions/jobs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ pr:
126126
<<: *job-linux-4c
127127
- name: pr-check-2
128128
<<: *job-linux-4c
129-
- name: pr-check-tidy
129+
- name: tidy
130130
continue_on_error: true
131131
free_disk: false
132132
env:
@@ -318,7 +318,7 @@ auto:
318318
- name: pr-check-2
319319
<<: *job-linux-4c
320320

321-
- name: pr-check-tidy
321+
- name: tidy
322322
free_disk: false
323323
<<: *job-linux-4c
324324

src/doc/rustc-dev-guide/src/tests/ci.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ kinds of builds (sets of jobs).
6767

6868
After each push to a pull request, a set of `pr` jobs are executed. Currently,
6969
these execute the `x86_64-gnu-llvm-X`, `x86_64-gnu-tools`, `pr-check-1`, `pr-check-2`
70-
and `pr-check-tidy` jobs, all running on Linux. These execute a relatively short
70+
and `tidy` jobs, all running on Linux. These execute a relatively short
7171
(~40 minutes) and lightweight test suite that should catch common issues. More
7272
specifically, they run a set of lints, they try to perform a cross-compile check
7373
build to Windows mingw (without producing any artifacts) and they test the

src/tools/tidy/src/rustdoc_js.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ fn get_eslint_version() -> Option<String> {
5252
}
5353

5454
pub fn check(librustdoc_path: &Path, tools_path: &Path, src_path: &Path, bad: &mut bool) {
55-
let eslint_version_path = src_path.join("ci/docker/host-x86_64/pr-check-tidy/eslint.version");
55+
let eslint_version_path = src_path.join("ci/docker/host-x86_64/tidy/eslint.version");
5656
let eslint_version = match std::fs::read_to_string(&eslint_version_path) {
5757
Ok(version) => version.trim().to_string(),
5858
Err(error) => {

0 commit comments

Comments
 (0)