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

Switch CI from bors to merge queue #13587

Merged
merged 3 commits into from
Nov 7, 2024
Merged

Conversation

Kobzol
Copy link
Contributor

@Kobzol Kobzol commented Oct 22, 2024

Context: https://rust-lang.zulipchat.com/#narrow/channel/242791-t-infra/topic/Reducing.20the.20amount.20of.20repos.20that.20use.20bors.2Fhomu

This should be merged with cooperation from an infra-admin.

Opening as a draft, because the CI on this repo is.. interesting :) So I want to make sure that the changes make sense. I renamed clippy_bors.yml to clippy.yml and clippy.yml to clippy_pr.yml, which makes the diff a bit.. tricky.

changelog: Move Clippy from bors to merge queues

@rustbot
Copy link
Collaborator

rustbot commented Oct 22, 2024

r? @flip1995

rustbot has assigned @flip1995.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

.github/workflows/clippy_pr.yml Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
@Kobzol
Copy link
Contributor Author

Kobzol commented Oct 25, 2024

Not sure if I understand the CI error: https://github.com/rust-lang/rust-clippy/actions/runs/11513171989/job/32049393605#step:6:39. Does it actually check that the link returns 200? In that case, we'll need to update the badge only after merging this.

@flip1995
Copy link
Member

Yes, it checks that all links in our markdown files actually lead to something (this check is actually copied from the Rust repo, so that we don't run into problems during sync).

@Kobzol
Copy link
Contributor Author

Kobzol commented Oct 25, 2024

Ok, I removed the badge URL changes, we can fix them up after this is merged.

@Kobzol
Copy link
Contributor Author

Kobzol commented Oct 25, 2024

CI failure looks spurious.

@flip1995
Copy link
Member

I restarted the run. It was spurious.

@Kobzol Kobzol marked this pull request as ready for review November 7, 2024 17:05
It would cause issues with the required jobs, and it is probably useless anyway, the vast majority of PRs seem to change Rust source files.
Copy link
Member

@flip1995 flip1995 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. We decided to remove the path filters for PRs and run every workflow on every PR: clippy test and clippy dev test ran anyway on almost all PRs and Remark is really quick to run. This way it is possible to require PR CI to be green, before the PR is put into the merge queue. The reviewer still doesn't have to wait for the PR to be green, but can press "merge when ready" before that.

@flip1995 flip1995 added this pull request to the merge queue Nov 7, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Nov 7, 2024
@flip1995 flip1995 added this pull request to the merge queue Nov 7, 2024
Merged via the queue into rust-lang:master with commit a28c44f Nov 7, 2024
9 checks passed
@Kobzol Kobzol deleted the ci-remove-bors branch November 7, 2024 17:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants