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.

Sign up for GitHub

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

Jump to bottom

Cleanup mingw-tidy docker job #106315

Merged
merged 1 commit into from
Jan 3, 2023
Merged

Cleanup mingw-tidy docker job #106315

merged 1 commit into from
Jan 3, 2023

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented Dec 31, 2022 •
edited
Loading

Fixes a couple small regressions from #106048 and #105714.

r? @fee1-dead

@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 31, 2022
@fee1-dead
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Dec 31, 2022

📌 Commit 4822f42 has been approved by fee1-dead

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 Dec 31, 2022
@Noratrieb Noratrieb mentioned this pull request Dec 31, 2022
Closed
Noratrieb added a commit to Noratrieb/rust that referenced this pull request Dec 31, 2022
@Noratrieb
Rollup merge of rust-lang#106315 - jyn514:cleanup-mingw-tidy, r=fee1-…
0f50014 
…dead

Cleanup `mingw-tidy` docker job

Fixes a couple small regressions from rust-lang#106048 and rust-lang#105714.

- Avoid `/checkout/src/ci/run.sh: line 187: [: =: unary operator expected`: https://github.com/rust-lang/rust/actions/runs/3809902408/jobs/6481611301#step:26:1701
- Avoid running `x check` in the tidy test, to get faster feedback. It's already run on the normal `mingw-check` job.

r? `@fee1-dead`
@bors
Copy link
Contributor

bors commented Jan 1, 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 cleanup-mingw-tidy (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 cleanup-mingw-tidy --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 
Auto-merging src/ci/docker/host-x86_64/mingw-check-tidy/Dockerfile
CONFLICT (content): Merge conflict in src/ci/docker/host-x86_64/mingw-check-tidy/Dockerfile
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 Jan 1, 2023
@bors
Copy link
Contributor

bors commented Jan 1, 2023

☔ The latest upstream changes (presumably #106336) made this pull request unmergeable. Please resolve the merge conflicts.

@jyn514
Cleanup mingw-tidy docker job
beefcf8 
- Avoid `/checkout/src/ci/run.sh: line 187: [: =: unary operator expected`: https://github.com/rust-lang/rust/actions/runs/3809902408/jobs/6481611301#step:26:1701
- Avoid running `x check` in the tidy test, to get faster feedback. It's
  already run on the normal `mingw-check` job.
@jyn514
Copy link
Member Author

jyn514 commented Jan 1, 2023

@bors r=fee1-dead

@bors
Copy link
Contributor

bors commented Jan 1, 2023

📌 Commit beefcf8 has been approved by fee1-dead

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 1, 2023
@jyn514
Copy link
Member Author

jyn514 commented Jan 1, 2023

@bors rollup

@bors
Copy link
Contributor

bors commented Jan 2, 2023

⌛ Testing commit beefcf8 with merge 45a5551f29d8afae3837aa4c578457637cc6ae71...

@bors
Copy link
Contributor

bors commented Jan 2, 2023

💔 Test failed - checks-actions

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

The job x86_64-gnu-tools failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
.......... (90/97)
.......    (97/97)


/checkout/src/test/rustdoc-gui/basic-code.goml basic-code... FAILED
[ERROR] (line 3) Error: Execution context was destroyed, most likely because of a navigation.: for command `wait-for: ".src-line-numbers"`
Build completed unsuccessfully in 0:02:42

@jyn514
Copy link
Member Author

jyn514 commented Jan 2, 2023

@bors retry

cc @GuillaumeGomez another spurious rustdoc-gui failure

@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 Jan 2, 2023
@GuillaumeGomez GuillaumeGomez mentioned this pull request Jan 2, 2023
Open
@compiler-errors compiler-errors mentioned this pull request Jan 2, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 3, 2023
@bors
Auto merge of rust-lang#106386 - compiler-errors:rollup-dxjv18b, r=co…
481c9ba 
…mpiler-errors

Rollup of 8 pull requests

Successful merges:

 - rust-lang#95985 (Add PhantomData marker to Context to make Context !Send and !Sync)
 - rust-lang#104298 (Add notes and examples about non-intuitive `PathBuf::set_extension` behavior)
 - rust-lang#105558 (Reduce HIR debug output)
 - rust-lang#106315 (Cleanup `mingw-tidy` docker job)
 - rust-lang#106354 (Rustdoc-Json: Report discriminant on all kinds of enum variant.)
 - rust-lang#106366 (Fix rustdoc ICE on bad typedef with mismatching types)
 - rust-lang#106376 (Update books)
 - rust-lang#106383 (Document some of the AST nodes)

Failed merges:

 - rust-lang#106356 (clean: Remove `ctor_kind` from `VariantStruct`.)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 0670a61 into rust-lang:master Jan 3, 2023
@rustbot rustbot added this to the 1.68.0 milestone Jan 3, 2023
@jyn514 jyn514 deleted the cleanup-mingw-tidy branch January 3, 2023 04:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@fee1-dead fee1-dead

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
Milestone
1.68.0
Development

Successfully merging this pull request may close these issues.
5 participants
@jyn514 @fee1-dead @bors @rust-log-analyzer @rustbot