-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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
ci: check if Cargo.lock is up-to-date #11994
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
r? @epage (rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
the
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
label
Apr 18, 2023
epage
reviewed
Apr 18, 2023
When changing cargo versions from stable to nightly, it's possible that the Cargo.lock format changes ever so slightly. This leaves the `Cargo.lock` file changed which is picked up by `git status`. This patch adjusts the `git status` invocation to limit itself to the CWD.
@bors r+ |
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
Apr 18, 2023
☀️ Test successful - checks-actions |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 21, 2023
Update cargo 14 commits in d0a4cbcee614fdb7ba66e860e603a00a644d71f8..de80432f04da61d98dcbbc1572598071718ccfd2 2023-04-16 17:42:50 +0000 to 2023-04-21 13:18:32 +0000 - Bump to 0.72.0; update changelog (rust-lang/cargo#12012) - Remove `src/doc` from `exclude` list in Cargo.toml (rust-lang/cargo#12000) - `--help` output use line wrap (rust-lang/cargo#12013) - Fix semver checks for 1.69 (rust-lang/cargo#12011) - Update contributor guide with new issue labels. (rust-lang/cargo#12003) - Better error message when getting an empty dep table (rust-lang/cargo#11997) - Fix broken links in contributor guide. (rust-lang/cargo#12002) - Update linux-raw-sys to 0.3.2 (rust-lang/cargo#11998) - chore: Use globs for workspace members (rust-lang/cargo#11996) - fix: Allow win/mac credential managers to build on all platforms (rust-lang/cargo#11993) - Add S-triage auto-label. (rust-lang/cargo#11995) - ci: check if Cargo.lock is up-to-date (rust-lang/cargo#11994) - Recompile on profile rustflags changes (rust-lang/cargo#11981) - Clarify some 1.69 changelog entries. (rust-lang/cargo#11982)
RalfJung
pushed a commit
to RalfJung/miri
that referenced
this pull request
Apr 22, 2023
Update cargo 14 commits in d0a4cbcee614fdb7ba66e860e603a00a644d71f8..de80432f04da61d98dcbbc1572598071718ccfd2 2023-04-16 17:42:50 +0000 to 2023-04-21 13:18:32 +0000 - Bump to 0.72.0; update changelog (rust-lang/cargo#12012) - Remove `src/doc` from `exclude` list in Cargo.toml (rust-lang/cargo#12000) - `--help` output use line wrap (rust-lang/cargo#12013) - Fix semver checks for 1.69 (rust-lang/cargo#12011) - Update contributor guide with new issue labels. (rust-lang/cargo#12003) - Better error message when getting an empty dep table (rust-lang/cargo#11997) - Fix broken links in contributor guide. (rust-lang/cargo#12002) - Update linux-raw-sys to 0.3.2 (rust-lang/cargo#11998) - chore: Use globs for workspace members (rust-lang/cargo#11996) - fix: Allow win/mac credential managers to build on all platforms (rust-lang/cargo#11993) - Add S-triage auto-label. (rust-lang/cargo#11995) - ci: check if Cargo.lock is up-to-date (rust-lang/cargo#11994) - Recompile on profile rustflags changes (rust-lang/cargo#11981) - Clarify some 1.69 changelog entries. (rust-lang/cargo#11982)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What does this PR try to resolve?
Fixes #11992. I believe there is no need to check git status here.
85dc569 from #11840 is also cherry-picked, since it doesn't need to check changes for the entire git repository.