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

fix(semver-check): adapt to a different error for variant not covered #11332

Merged
merged 1 commit into from
Nov 3, 2022
Merged

fix(semver-check): adapt to a different error for variant not covered #11332

merged 1 commit into from
Nov 3, 2022

Conversation

weihanglo
Copy link
Member

Here foudn the error https://github.com/rust-lang/cargo/actions/runs/3387258044/jobs/5627752968.

I am not sure which commit in rust-lang/rust is causing the error, but this PR should work.

@rustbot
Copy link
Collaborator

rustbot commented Nov 3, 2022

r? @epage

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

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 3, 2022
Muscraft
Muscraft approved these changes Nov 3, 2022
View reviewed changes
Copy link
Member

@Muscraft Muscraft left a comment

Choose a reason for hiding this comment

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

Thanks for this! It looks like it is needed for #11331, while I can't approve it via bors, I think you can tell bors that I approved it

@weihanglo
Copy link
Member Author

Thanks!

@bors r=Muscraft

@bors
Copy link
Contributor

bors commented Nov 3, 2022

📌 Commit bc16cdb has been approved by Muscraft

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 Nov 3, 2022
@bors
Copy link
Contributor

bors commented Nov 3, 2022

⌛ Testing commit bc16cdb with merge 5b463fe...

bors added a commit that referenced this pull request Nov 3, 2022
@bors
Auto merge of #11332 - weihanglo:fix-semver-check, r=Muscraft
5b463fe 
fix(semver-check): adapt to a different error for variant not covered
@weihanglo weihanglo mentioned this pull request Nov 3, 2022
Merged
@bors
Copy link
Contributor

bors commented Nov 3, 2022

💔 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 Nov 3, 2022
@weihanglo
Copy link
Member Author

@bors retry

Cannot reproduce on my machine. There is a thread sleep in the test. Maybe that is causing a race?
Anyway, let's try it again.

running `/Users/runner/work/cargo/cargo/target/debug/cargo build -Z unstable-options --out-dir out`
running `/Users/runner/work/cargo/cargo/target/tmp/cit/t1625/foo/out/foo`
running `/Users/runner/work/cargo/cargo/target/debug/cargo build -Z unstable-options --out-dir out`
running `/Users/runner/work/cargo/cargo/target/tmp/cit/t1625/foo/out/foo`
thread 'out_dir::replaces_artifacts' panicked at '
test failed running `/Users/runner/work/cargo/cargo/target/tmp/cit/t1625/foo/out/foo`
error: stdout did not match:
error: test failed, to rerun pass `--test testsuite`
1        -bar
    1    +foo

@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 Nov 3, 2022
@bors
Copy link
Contributor

bors commented Nov 3, 2022

⌛ Testing commit bc16cdb with merge 2d70754...

@bors
Copy link
Contributor

bors commented Nov 3, 2022

☀️ Test successful - checks-actions
Approved by: Muscraft
Pushing 2d70754 to master...

@bors bors merged commit 2d70754 into rust-lang:master Nov 3, 2022
@weihanglo weihanglo deleted the fix-semver-check branch November 3, 2022 20:32
@weihanglo weihanglo mentioned this pull request Nov 4, 2022
Merged
bors pushed a commit to rust-lang-ci/rust that referenced this pull request Nov 5, 2022
@weihanglo
Update cargo
bfce227 
20 commits in 7e484fc1a766f56dbc95380f45719698e0c82749..9286a1beba5b28b115bad67de2ae91fb1c61eb0b
2022-10-27 15:20:57 +0000 to 2022-11-04 06:41:49 +0000
- chore: Upgrade dependencies (rust-lang/cargo#11328)
- Clean more aggressively in CI (rust-lang/cargo#11335)
- Remove remove_dir_all (rust-lang/cargo#11333)
- test(publish): Cover more wait-for-publish cases (rust-lang/cargo#11327)
- Revert rust-lang/cargo#11183 (rust-lang/cargo#11331)
- fix(semver-check): adapt to a different error for variant not covered (rust-lang/cargo#11332)
- Update curl-sys (rust-lang/cargo#11326)
- Mention fix on build script deadlock (rust-lang/cargo#11325)
- Make cargo forward pre-existing CARGO if set (rust-lang/cargo#11285)
- Clean up workspace dependencies after cargo remove (rust-lang/cargo#11242)
- Update the outdated link for rust-semverver (rust-lang/cargo#11322)
- Fix broken link to compilation entry point (rust-lang/cargo#11317)
- Only remove fingerprints and build script artifacts of the requested package (rust-lang/cargo#10621)
- Newer anyhow features are required (rust-lang/cargo#11316)
- Clean stale git temp files (rust-lang/cargo#11308)
- Report crate size on package and publish (rust-lang/cargo#11270)
- add a note that some warnings (and/or errors) can be auto-fixed (rust-lang/cargo#10989)
- Update libcurl (rust-lang/cargo#11307)
- artifact deps shoud works when target field specified coexists with `optional = true` (rust-lang/cargo#11183)
- Fix singular verb in tests page (rust-lang/cargo#11300)
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 5, 2022
@bors
Auto merge of rust-lang#103992 - weihanglo:update-cargo, r=weihanglo
5b3e909 
Update cargo

20 commits in 7e484fc1a766f56dbc95380f45719698e0c82749..9286a1beba5b28b115bad67de2ae91fb1c61eb0b 2022-10-27 15:20:57 +0000 to 2022-11-04 06:41:49 +0000
- chore: Upgrade dependencies (rust-lang/cargo#11328)
- Clean more aggressively in CI (rust-lang/cargo#11335)
- Remove remove_dir_all (rust-lang/cargo#11333)
- test(publish): Cover more wait-for-publish cases (rust-lang/cargo#11327)
- Revert rust-lang/cargo#11183 (rust-lang/cargo#11331)
- fix(semver-check): adapt to a different error for variant not covered (rust-lang/cargo#11332)
- Update curl-sys (rust-lang/cargo#11326)
- Mention fix on build script deadlock (rust-lang/cargo#11325)
- Make cargo forward pre-existing CARGO if set (rust-lang/cargo#11285)
- Clean up workspace dependencies after cargo remove (rust-lang/cargo#11242)
- Update the outdated link for rust-semverver (rust-lang/cargo#11322)
- Fix broken link to compilation entry point (rust-lang/cargo#11317)
- Only remove fingerprints and build script artifacts of the requested package (rust-lang/cargo#10621)
- Newer anyhow features are required (rust-lang/cargo#11316)
- Clean stale git temp files (rust-lang/cargo#11308)
- Report crate size on package and publish (rust-lang/cargo#11270)
- add a note that some warnings (and/or errors) can be auto-fixed (rust-lang/cargo#10989)
- Update libcurl (rust-lang/cargo#11307)
- artifact deps shoud works when target field specified coexists with `optional = true` (rust-lang/cargo#11183)
- Fix singular verb in tests page (rust-lang/cargo#11300)

r? `@ghost`
ehuss pushed a commit to ehuss/cargo that referenced this pull request Nov 15, 2022
@bors @ehuss
Auto merge of rust-lang#11332 - weihanglo:fix-semver-check, r=Muscraft
e3daada 
fix(semver-check): adapt to a different error for variant not covered
@ehuss ehuss mentioned this pull request Nov 15, 2022
Merged
bors added a commit that referenced this pull request Nov 15, 2022
@bors
Auto merge of #11381 - ehuss:beta-fix-safe-directory, r=weihanglo
d65d197 
[beta-1.66] Backport fix for git2 safe-directory disable

Beta backports:

* #11366 — fix git2 safe-directory disable
* #11332 — fix semver documentation for change in non_exhaustive
* #11335 — Clean more aggressively in CI
@ehuss ehuss added this to the 1.67.0 milestone Mar 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Muscraft Muscraft Muscraft approved these changes

Assignees

@epage epage

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.67.0
Development

Successfully merging this pull request may close these issues.
6 participants
@weihanglo @rustbot @bors @Muscraft @ehuss @epage