chore: remove version field from publish=false packages
#13254
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
A-cli-help
weihanglo
changed the title
version field from unpublished packagesversion field from publish=false packages
weihanglo
force-pushed
the
versionless
branch
2 times, most recently
from
63b0489
to
bfc9880
Compare
|
@bors r+ This reminds me that I need to update cargo-release |
bors
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Jan 5, 2024
chore: remove `version` field from `publish=false` packages
|
https://github.com/rust-lang/cargo/actions/runs/7426946854/job/20211683866?pr=13254 I guess the renovatebot MSRV is broken since #12654? |
|
💔 Test failed - checks-actions |
bors
added
S-waiting-on-review
epage
added a commit
to epage/cargo
that referenced
this pull request
Jan 6, 2024
Example: clap-rs/clap#4824 I'm hoping this will make it easier to see what is going on with problems with RenovateBot, like our MSRVs not updating atm (rust-lang#13254).
bors
added a commit
that referenced
this pull request
Jan 6, 2024
chore: Add dependency dashboard Example: clap-rs/clap#4824 I'm hoping this will make it easier to see what is going on with problems with RenovateBot, like our MSRVs not updating atm (#13254).
epage
added a commit
to epage/cargo
that referenced
this pull request
Jan 8, 2024
With rust-lang#13254, we found MSRV updating is broken. PR rust-lang#12775 is the last MSRV we got. That was merged before rust-lang#12654 and rust-lang#13106. That makes rust-lang#12654 the most likely culprit. Looking at the logs: ``` DEBUG: Matched 24 file(s) for manager regex: Cargo.toml, benches/benchsuite/Cargo.toml, benches/capture/Cargo.toml, crates/cargo-platform/Cargo.toml, crates/cargo-test-macro/Cargo.toml, crates/cargo-test-support/Cargo.toml, crates/cargo-test-support/containers/apache/bar/Cargo.toml, crates/cargo-test-support/containers/sshd/bar/Cargo.toml, crates/cargo-util-schemas/Cargo.toml, crates/cargo-util/Cargo.toml, crates/crates-io/Cargo.toml, crates/home/Cargo.toml, crates/mdman/Cargo.toml, crates/resolver-tests/Cargo.toml, crates/rustfix/Cargo.toml, crates/semver-check/Cargo.toml, crates/xtask-build-man/Cargo.toml, crates/xtask-bump-check/Cargo.toml, crates/xtask-stale-label/Cargo.toml, credential/cargo-credential-1password/Cargo.toml, credential/cargo-credential-libsecret/Cargo.toml, credential/cargo-credential-macos-keychain/Cargo.toml, credential/cargo-credential-wincred/Cargo.toml, credential/cargo-credential/Cargo.toml ... DEBUG: manager extract durations (ms) { "managers": { "dockerfile": 30, "github-actions": 38, "regex": 386, "cargo": 855 } } DEBUG: Found cargo package files DEBUG: Found dockerfile package files DEBUG: Found github-actions package files DEBUG: Found 25 package file(s) ``` Our regex managers have the files matched but no regex manager packages are found. I think this means that the name association failed or the regex within the file content failed. The differences between cargo and my other projects - Use of `:` - `depNameTemplate` - Presence of `\b` As a first attempt, I'm going to switch `\b` to `\\b` to be like the other escaped regex values.
bors
added a commit
that referenced
this pull request
Jan 8, 2024
chore(ci): Shot-in-the-dark fix for MSRV updating With #13254, we found MSRV updating is broken. PR #12775 is the last MSRV we got. That was merged before #12654 and #13106. That makes #12654 the most likely culprit. Looking at the logs: ``` DEBUG: Matched 24 file(s) for manager regex: Cargo.toml, benches/benchsuite/Cargo.toml, benches/capture/Cargo.toml, crates/cargo-platform/Cargo.toml, crates/cargo-test-macro/Cargo.toml, crates/cargo-test-support/Cargo.toml, crates/cargo-test-support/containers/apache/bar/Cargo.toml, crates/cargo-test-support/containers/sshd/bar/Cargo.toml, crates/cargo-util-schemas/Cargo.toml, crates/cargo-util/Cargo.toml, crates/crates-io/Cargo.toml, crates/home/Cargo.toml, crates/mdman/Cargo.toml, crates/resolver-tests/Cargo.toml, crates/rustfix/Cargo.toml, crates/semver-check/Cargo.toml, crates/xtask-build-man/Cargo.toml, crates/xtask-bump-check/Cargo.toml, crates/xtask-stale-label/Cargo.toml, credential/cargo-credential-1password/Cargo.toml, credential/cargo-credential-libsecret/Cargo.toml, credential/cargo-credential-macos-keychain/Cargo.toml, credential/cargo-credential-wincred/Cargo.toml, credential/cargo-credential/Cargo.toml ... DEBUG: manager extract durations (ms) { "managers": { "dockerfile": 30, "github-actions": 38, "regex": 386, "cargo": 855 } } DEBUG: Found cargo package files DEBUG: Found dockerfile package files DEBUG: Found github-actions package files DEBUG: Found 25 package file(s) ``` Our regex managers have the files matched but no regex manager packages are found. I think this means that the name association failed or the regex within the file content failed. The differences between cargo and my other projects - Use of `:` - `depNameTemplate` - Presence of `\b` As a first attempt, I'm going to switch `\b` to `\\b` to be like the other escaped regex values.
|
💡 This pull request was already approved, no need to approve it again.
|
|
💔 Test failed - checks-actions |
bors
added
S-waiting-on-review
|
Oh right, we are verifying the MSRV locally which means all packages need to be able to be loaded. We could verify this if cargo hack could package a workspace and then run tests on that. |
As far as I know, you can avoid this error by just passing the existing
(At least I confirmed this for a project that MSRV is 1.60. openrr/mesh-loader@4a30845) |
|
CI failure is due to --no-private not handling workspace members with globs, well. I will work on a fix... |
I have created a rough fix locally and it appears to be working well. log$ git log --graph --decorate --oneline | head -2
* d7d657528 (HEAD -> versionless) chore(ci): cargo-hack `--no-private`
* bfc9880b3 chore: remove `version` field from `publish=false` packages
$ cargo hack check --rust-version --workspace --no-private --no-dev-deps
info: --no-dev-deps and --no-private modify real `Cargo.toml` while cargo-hack is running and restores it when finished
info: skipped running on private package `cargo-test-macro`
info: skipped running on private package `cargo-test-support`
info: skipped running on private package `mdman`
info: skipped running on private package `resolver-tests`
info: skipped running on private package `semver-check`
info: skipped running on private package `xtask-build-man`
info: skipped running on private package `xtask-bump-check`
info: skipped running on private package `xtask-stale-label`
info: skipped running on private package `benchsuite`
info: skipped running on private package `capture`
info: running `rustup run 1.70 cargo check` on cargo-platform (1/12)
warning: /Users/taiki/projects/forks/rust-lang/cargo/crates/cargo-platform/Cargo.toml: unused manifest key: lints
<omitted 12 warnings about "unused manifest key: lints">
Finished dev [unoptimized + debuginfo] target(s) in 0.23s
info: running `rustup run 1.70 cargo check` on home (2/12)
warning: /Users/taiki/projects/forks/rust-lang/cargo/credential/cargo-credential-libsecret/Cargo.toml: unused manifest key: lints
<omitted 12 warnings about "unused manifest key: lints">
Finished dev [unoptimized + debuginfo] target(s) in 0.06s
info: running `rustup run 1.70 cargo check` on cargo-credential (3/12)
<omitted 12 warnings about "unused manifest key: lints">
warning: /Users/taiki/projects/forks/rust-lang/cargo/credential/cargo-credential-wincred/Cargo.toml: unused manifest key: lints
Finished dev [unoptimized + debuginfo] target(s) in 0.06s
info: running `rustup run 1.70 cargo check` on rustfix (4/12)
warning: /Users/taiki/projects/forks/rust-lang/cargo/credential/cargo-credential-1password/Cargo.toml: unused manifest key: lints
<omitted 12 warnings about "unused manifest key: lints">
Finished dev [unoptimized + debuginfo] target(s) in 0.07s
info: running `rustup run 1.70 cargo check` on cargo-credential-1password (5/12)
warning: /Users/taiki/projects/forks/rust-lang/cargo/credential/cargo-credential/Cargo.toml: unused manifest key: lints
<omitted 12 warnings about "unused manifest key: lints">
Finished dev [unoptimized + debuginfo] target(s) in 0.07s
info: running `rustup run 1.73 cargo check` on cargo-util (6/12)
warning: /Users/taiki/projects/forks/rust-lang/cargo/credential/cargo-credential-wincred/Cargo.toml: unused manifest key `lints` (may be supported in a future version)
<omitted 12 warnings about "unused manifest key: lints">
Finished dev [unoptimized + debuginfo] target(s) in 0.08s
info: running `rustup run 1.73 cargo check` on crates-io (7/12)
warning: /Users/taiki/projects/forks/rust-lang/cargo/crates/cargo-platform/Cargo.toml: unused manifest key `lints` (may be supported in a future version)
<omitted 12 warnings about "unused manifest key: lints">
Finished dev [unoptimized + debuginfo] target(s) in 0.05s
info: running `rustup run 1.73 cargo check` on cargo-util-schemas (8/12)
warning: /Users/taiki/projects/forks/rust-lang/cargo/credential/cargo-credential-macos-keychain/Cargo.toml: unused manifest key `lints` (may be supported in a future version)
<omitted 12 warnings about "unused manifest key: lints">
Finished dev [unoptimized + debuginfo] target(s) in 0.05s
info: running `rustup run 1.73 cargo check` on cargo (9/12)
<omitted 12 warnings about "unused manifest key: lints">
Finished dev [unoptimized + debuginfo] target(s) in 0.14s
info: running `rustup run 1.73 cargo check` on cargo-credential-libsecret (10/12)
warning: /Users/taiki/projects/forks/rust-lang/cargo/crates/home/Cargo.toml: unused manifest key `lints` (may be supported in a future version)
<omitted 12 warnings about "unused manifest key: lints">
Finished dev [unoptimized + debuginfo] target(s) in 0.05s
info: running `rustup run 1.73 cargo check` on cargo-credential-macos-keychain (11/12)
warning: /Users/taiki/projects/forks/rust-lang/cargo/crates/crates-io/Cargo.toml: unused manifest key `lints` (may be supported in a future version)
<omitted 12 warnings about "unused manifest key: lints">
Finished dev [unoptimized + debuginfo] target(s) in 0.05s
info: running `rustup run 1.73 cargo check` on cargo-credential-wincred (12/12)
warning: /Users/taiki/projects/forks/rust-lang/cargo/credential/cargo-credential-macos-keychain/Cargo.toml: unused manifest key `lints` (may be supported in a future version)
<omitted 12 warnings about "unused manifest key: lints">
Finished dev [unoptimized + debuginfo] target(s) in 0.05sOne thing to note is that the use of the --all-targets flag (that builds tests/examples) needed to be removed and the --no-dev-deps flag is needed. This is because the dev-dependencies use versionless manifests that cannot be read by the old compiler. That said, we are not running tests with the old compiler, so I don't see a problem if the test suite cannot be built on the old compiler. |
|
☔ The latest upstream changes (presumably #13324) made this pull request unmergeable. Please resolve the merge conflicts. |
This fixes this immediate problem but not others. For example, if rust-lang/rfcs#3537 gets merged, we are then blocked on setting our |
This fix has been released in cargo-hack 0.6.16. |
In 1.75 cargo allows versionless manifest. We should keep up and dogfood ourselves.
--no-private Perform without publish = false crates. This is similar to --ignore-private, but is more powerful because this also prevents private crates from affecting lockfile and metadata.
weihanglo
force-pushed
the
versionless
branch
from
d7d6575
to
0f2c2f1
Compare
taiki-e
reviewed
Jan 25, 2024
weihanglo
force-pushed
the
versionless
branch
from
0f2c2f1
to
45e9d9a
Compare
One thing to note is that the use of the --all-targets flag (that builds tests/examples) needed to be removed and the --no-dev-deps flag is needed. This is because the dev-dependencies use versionless manifests that cannot be read by the old compiler. That said, we are not running tests with the old compiler, so I don't see a problem if the test suite cannot be built on the old compiler. Co-authored-by: Taiki Endo <te316e89@gmail.com>
weihanglo
force-pushed
the
versionless
branch
from
45e9d9a
to
ebb7ff4
Compare
@epage do you think this is a blocker? |
|
That was more of a "this isn't a panacea" to the larger MSRV conversation. For me, I'm uncomfortable with it hacking up the source as it tests and I would prefer checking test targets but not enough to say "no" if you want to move forward with this knowing that there are those reservations. |
|
Got it. I think this is a good example for relevant MSRV conversation. This doesn't block anything so I'll just leave here, also for reminding us there are rooms for a better workflow :) |
stupendoussuperpowers
pushed a commit
to stupendoussuperpowers/cargo
that referenced
this pull request
Feb 28, 2024
With rust-lang#13254, we found MSRV updating is broken. PR rust-lang#12775 is the last MSRV we got. That was merged before rust-lang#12654 and rust-lang#13106. That makes rust-lang#12654 the most likely culprit. Looking at the logs: ``` DEBUG: Matched 24 file(s) for manager regex: Cargo.toml, benches/benchsuite/Cargo.toml, benches/capture/Cargo.toml, crates/cargo-platform/Cargo.toml, crates/cargo-test-macro/Cargo.toml, crates/cargo-test-support/Cargo.toml, crates/cargo-test-support/containers/apache/bar/Cargo.toml, crates/cargo-test-support/containers/sshd/bar/Cargo.toml, crates/cargo-util-schemas/Cargo.toml, crates/cargo-util/Cargo.toml, crates/crates-io/Cargo.toml, crates/home/Cargo.toml, crates/mdman/Cargo.toml, crates/resolver-tests/Cargo.toml, crates/rustfix/Cargo.toml, crates/semver-check/Cargo.toml, crates/xtask-build-man/Cargo.toml, crates/xtask-bump-check/Cargo.toml, crates/xtask-stale-label/Cargo.toml, credential/cargo-credential-1password/Cargo.toml, credential/cargo-credential-libsecret/Cargo.toml, credential/cargo-credential-macos-keychain/Cargo.toml, credential/cargo-credential-wincred/Cargo.toml, credential/cargo-credential/Cargo.toml ... DEBUG: manager extract durations (ms) { "managers": { "dockerfile": 30, "github-actions": 38, "regex": 386, "cargo": 855 } } DEBUG: Found cargo package files DEBUG: Found dockerfile package files DEBUG: Found github-actions package files DEBUG: Found 25 package file(s) ``` Our regex managers have the files matched but no regex manager packages are found. I think this means that the name association failed or the regex within the file content failed. The differences between cargo and my other projects - Use of `:` - `depNameTemplate` - Presence of `\b` As a first attempt, I'm going to switch `\b` to `\\b` to be like the other escaped regex values.
|
☔ The latest upstream changes (presumably #13523) made this pull request unmergeable. Please resolve the merge conflicts. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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?
In 1.75 cargo allows
versionless manifest.We should keep up and dogfood ourselves.
How should we test and review this PR?
Additional information