Rename mingw-check-tidy to tidy
This commit is contained in:
parent
62949cd2d6
commit
6671d9b92a
8 changed files with 10 additions and 10 deletions
4
.github/workflows/ghcr.yml
vendored
4
.github/workflows/ghcr.yml
vendored
|
|
@ -53,9 +53,9 @@ jobs:
|
|||
run: |
|
||||
# List of DockerHub images to mirror to ghcr.io
|
||||
images=(
|
||||
# Mirrored because used by pr-check-tidy, which doesn't cache Docker images
|
||||
# Mirrored because used by the tidy job, which doesn't cache Docker images
|
||||
"ubuntu:22.04"
|
||||
# Mirrored because used by all linux CI jobs, including pr-check-tidy
|
||||
# Mirrored because used by all linux CI jobs, including tidy
|
||||
"moby/buildkit:buildx-stable-1"
|
||||
# Mirrored because used when CI is running inside a Docker container
|
||||
"alpine:3.4"
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ try-job: dist-i686-msvc"#,
|
|||
fn pr_jobs() {
|
||||
let stdout = get_matrix("pull_request", "commit", "refs/heads/pr/1234");
|
||||
insta::assert_snapshot!(stdout, @r#"
|
||||
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"}]
|
||||
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"}]
|
||||
run_type=pr
|
||||
"#);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ pr:
|
|||
<<: *job-linux-4c
|
||||
- name: pr-check-2
|
||||
<<: *job-linux-4c
|
||||
- name: pr-check-tidy
|
||||
- name: tidy
|
||||
continue_on_error: true
|
||||
doc_url: https://foo.bar
|
||||
<<: *job-linux-4c
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
# We use the ghcr base image because ghcr doesn't have a rate limit
|
||||
# and the pr-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,7 +29,7 @@ RUN sh /scripts/nodejs.sh /node
|
|||
ENV PATH="/node/bin:${PATH}"
|
||||
|
||||
# Install eslint
|
||||
COPY host-x86_64/pr-check-tidy/eslint.version /tmp/
|
||||
COPY host-x86_64/tidy/eslint.version /tmp/
|
||||
|
||||
COPY scripts/sccache.sh /scripts/
|
||||
RUN sh /scripts/sccache.sh
|
||||
|
|
@ -126,7 +126,7 @@ pr:
|
|||
<<: *job-linux-4c
|
||||
- name: pr-check-2
|
||||
<<: *job-linux-4c
|
||||
- name: pr-check-tidy
|
||||
- name: tidy
|
||||
continue_on_error: true
|
||||
free_disk: false
|
||||
env:
|
||||
|
|
@ -318,7 +318,7 @@ auto:
|
|||
- name: pr-check-2
|
||||
<<: *job-linux-4c
|
||||
|
||||
- name: pr-check-tidy
|
||||
- name: tidy
|
||||
free_disk: false
|
||||
<<: *job-linux-4c
|
||||
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ kinds of builds (sets of jobs).
|
|||
|
||||
After each push to a pull request, a set of `pr` jobs are executed. Currently,
|
||||
these execute the `x86_64-gnu-llvm-X`, `x86_64-gnu-tools`, `pr-check-1`, `pr-check-2`
|
||||
and `pr-check-tidy` jobs, all running on Linux. These execute a relatively short
|
||||
and `tidy` jobs, all running on Linux. These execute a relatively short
|
||||
(~40 minutes) and lightweight test suite that should catch common issues. More
|
||||
specifically, they run a set of lints, they try to perform a cross-compile check
|
||||
build to Windows mingw (without producing any artifacts) and they test the
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ fn get_eslint_version() -> Option<String> {
|
|||
}
|
||||
|
||||
pub fn check(librustdoc_path: &Path, tools_path: &Path, src_path: &Path, bad: &mut bool) {
|
||||
let eslint_version_path = src_path.join("ci/docker/host-x86_64/pr-check-tidy/eslint.version");
|
||||
let eslint_version_path = src_path.join("ci/docker/host-x86_64/tidy/eslint.version");
|
||||
let eslint_version = match std::fs::read_to_string(&eslint_version_path) {
|
||||
Ok(version) => version.trim().to_string(),
|
||||
Err(error) => {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue