Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use problem matchers for tidy CI #106085

Merged
merged 2 commits into from
Mar 11, 2023

Conversation

fee1-dead
Copy link
Member

No description provided.

@rustbot
Copy link
Collaborator

rustbot commented Dec 23, 2022

r? @pietroalbini

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Dec 23, 2022
@rust-log-analyzer

This comment has been minimized.

@fee1-dead fee1-dead force-pushed the tidy-ci-matchers branch 2 times, most recently from 77424db to 7e29713 Compare December 24, 2022 14:09
@fee1-dead fee1-dead marked this pull request as ready for review December 24, 2022 15:34
@fee1-dead
Copy link
Member Author

See this to confirm that it is working correctly.

@pietroalbini
Copy link
Member

The duplication is unfortunate... tidy should (?) be the same across jobs, can we collect annotations only from one of them?

@fee1-dead
Copy link
Member Author

fee1-dead commented Dec 25, 2022

The duplication is unfortunate... tidy should (?) be the same across jobs, can we collect annotations only from one of them?

It might be best to only run tidy on mingw-check-tidy. A lot of other platforms run by bors run full tests which include tidy already so that should not be a concern for bors. For PR CI the mingw-check-tidy job was designed to not cancel other (perhaps with more interesting errors) jobs if tidy fails.

@Mark-Simulacrum
Copy link
Member

I believe some parts of tidy are platform specific (e.g., checking binaries/executable files checked into tree). I'm not sure if there's anything else like that.

@fee1-dead
Copy link
Member Author

I believe some parts of tidy are platform specific (e.g., checking binaries/executable files checked into tree). I'm not sure if there's anything else like that.

I checked that part of tidy and it looks like it only runs on unix systems and it just checks if there are files marked as executable.

@pietroalbini
Copy link
Member

Yeah let's only run tidy in its dedicated job to remove the duplicate annotations.

@fee1-dead
Copy link
Member Author

I've pushed a commit to not run tidy on x86_64-gnu-llvm-13, which should resolve this.

@fee1-dead
Copy link
Member Author

@pietroalbini @Mark-Simulacrum any updates?

@pietroalbini
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Mar 5, 2023

📌 Commit ab8b63f3abfaaee85ba5d928b56c0eb4541ef4fb has been approved by pietroalbini

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 5, 2023
@bors
Copy link
Contributor

bors commented Mar 6, 2023

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout tidy-ci-matchers (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self tidy-ci-matchers --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message
CONFLICT (modify/delete): src/ci/docker/host-x86_64/x86_64-gnu-llvm-13/Dockerfile deleted in HEAD and modified in heads/homu-tmp. Version heads/homu-tmp of src/ci/docker/host-x86_64/x86_64-gnu-llvm-13/Dockerfile left in tree.
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 27502 and retry the command.
Automatic merge failed; fix conflicts and then commit the result.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 6, 2023
@fee1-dead
Copy link
Member Author

Rebased.

@bors r=pietroalbini

@bors
Copy link
Contributor

bors commented Mar 7, 2023

📌 Commit a2040de has been approved by pietroalbini

It is now in the queue for this repository.

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 10, 2023
…, r=pietroalbini

use problem matchers for tidy CI
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 10, 2023
…, r=pietroalbini

use problem matchers for tidy CI
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 10, 2023
…, r=pietroalbini

use problem matchers for tidy CI
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 11, 2023
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#105798 (Relax ordering rules for `asm!` operands)
 - rust-lang#105962 (Stabilize path_as_mut_os_str)
 - rust-lang#106085 (use problem matchers for tidy CI)
 - rust-lang#107711 (Stabilize movbe target feature)
 - rust-lang#108017 (Add `--no-undefined-version` link flag and fix associated breakage)
 - rust-lang#108891 (Remove an extraneous include)
 - rust-lang#108902 (no more do while :<)
 - rust-lang#108912 (Document tool lints)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit b5de008 into rust-lang:master Mar 11, 2023
@rustbot rustbot added this to the 1.70.0 milestone Mar 11, 2023
bjorn3 pushed a commit to bjorn3/rust that referenced this pull request Mar 15, 2023
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#105798 (Relax ordering rules for `asm!` operands)
 - rust-lang#105962 (Stabilize path_as_mut_os_str)
 - rust-lang#106085 (use problem matchers for tidy CI)
 - rust-lang#107711 (Stabilize movbe target feature)
 - rust-lang#108017 (Add `--no-undefined-version` link flag and fix associated breakage)
 - rust-lang#108891 (Remove an extraneous include)
 - rust-lang#108902 (no more do while :<)
 - rust-lang#108912 (Document tool lints)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
jyn514 added a commit to jyn514/rust that referenced this pull request Mar 17, 2023
This also fixes a regression from
rust-lang#106085 which stopped testing that
we support python2 in PR CI.
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 20, 2023
…lacrum

Add tests for configure.py

I highly recommend reviewing this with whitespace disabled.

Notably, verifying that we generate valid toml relies on python 3.11 so
we can use `tomllib`, so this also switches`x86_64-gnu-llvm-14` (one of the PR builders) to use 3.11.

While fixing that, I noticed that we stopped testing python2.7 support on PR CI in rust-lang#106085. `@fee1-dead` `@pietroalbini` please be more careful in the future, there is no CI for CI itself that verifies we are testing everything we should be.

- Separate out functions so that each unit test doesn't create a file on disk
- Add a few unit tests
@oli-obk oli-obk deleted the tidy-ci-matchers branch March 31, 2023 11:42
cuviper added a commit to cuviper/rust that referenced this pull request Apr 16, 2023
Like rust-lang#107044, this will let us track compatibility with LLVM 16 going
forward, especially after we eventually upgrade our own to the next.

This also drops `tidy` here and in `x86_64-gnu-llvm-15`, syncing with
that change in rust-lang#106085.
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 18, 2023
…lacrum

ci: add a runner for vanilla LLVM 16

Like rust-lang#107044, this will let us track compatibility with LLVM 16 going
forward, especially after we eventually upgrade our own to the next.

This also drops `tidy` here and in `x86_64-gnu-llvm-15`, syncing with
that change in rust-lang#106085.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants