chore: remove `version` field from `publish=false` packages #13254

weihanglo · 2024-01-05T21:33:29Z

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

rustbot · 2024-01-05T21:33:34Z

r? @epage

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

epage · 2024-01-05T21:39:40Z

@bors r+

This reminds me that I need to update cargo-release

bors · 2024-01-05T21:39:43Z

📌 Commit bfc9880 has been approved by epage

It is now in the queue for this repository.

bors · 2024-01-05T21:40:53Z

⌛ Testing commit bfc9880 with merge 0e4ea9b...

chore: remove `version` field from `publish=false` packages

weihanglo · 2024-01-05T21:59:04Z

https://github.com/rust-lang/cargo/actions/runs/7426946854/job/20211683866?pr=13254

I guess the renovatebot MSRV is broken since #12654?

bors · 2024-01-05T22:21:12Z

💔 Test failed - checks-actions

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).

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).

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.

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.

weihanglo · 2024-01-10T15:28:13Z

Should be fine after #13265. Let give it a try.

@bors r=epage

bors · 2024-01-10T15:28:15Z

💡 This pull request was already approved, no need to approve it again.

This pull request previously failed. You should add more commits to fix the bug, or use retry to trigger a build again.

bors · 2024-01-10T15:28:16Z

📌 Commit bfc9880 has been approved by epage

It is now in the queue for this repository.

epage · 2024-01-10T16:43:30Z

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.

taiki-e · 2024-01-17T01:54:54Z

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 --no-private flag (instead of --ignore-private flag).

--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.

(At least I confirmed this for a project that MSRV is 1.60. openrr/mesh-loader@4a30845)

taiki-e · 2024-01-17T14:05:48Z

CI failure is due to --no-private not handling workspace members with globs, well. I will work on a fix...

info: removing private crates from /Users/taiki/projects/forks/rust-lang/cargo/Cargo.toml
error: failed to compare /Users/taiki/projects/forks/rust-lang/cargo/crates/cargo-test-macro/Cargo.toml and /Users/taiki/projects/forks/rust-lang/cargo/crates/*/Cargo.toml: No such file or directory (os error 2)

taiki-e · 2024-01-17T14:54:28Z

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.05s

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.

bors · 2024-01-19T01:04:01Z

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

epage · 2024-01-20T02:21:23Z

As far as I know, you can avoid this error by just passing the existing --no-private flag (instead of --ignore-private flag).

This fixes this immediate problem but not others. For example, if rust-lang/rfcs#3537 gets merged, we are then blocked on setting our N-0 rust-versions to auto until its supported on all of our MSRVs.

taiki-e · 2024-01-24T16:51:29Z

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.

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.

.github/workflows/main.yml

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 · 2024-01-25T02:44:29Z

As far as I know, you can avoid this error by just passing the existing --no-private flag (instead of --ignore-private flag).

This fixes this immediate problem but not others. For example, if rust-lang/rfcs#3537 gets merged, we are then blocked on setting our N-0 rust-versions to auto until its supported on all of our MSRVs.

@epage do you think this is a blocker?

epage · 2024-01-25T03:11:29Z

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.

weihanglo · 2024-01-25T03:28:25Z

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 :)

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 · 2024-03-03T22:09:47Z

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

weihanglo · 2024-05-16T04:17:13Z

Since it is not too important, I am not going to pursue this.

rustbot assigned epage Jan 5, 2024

weihanglo changed the title ~~chore: remove version field from unpublished packages~~ chore: remove version field from publish=false packages Jan 5, 2024

weihanglo force-pushed the versionless branch 2 times, most recently from 63b0489 to bfc9880 Compare January 5, 2024 21:34

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 5, 2024

bors added a commit that referenced this pull request Jan 5, 2024

Auto merge of #13254 - weihanglo:versionless, r=epage

0e4ea9b

chore: remove `version` field from `publish=false` packages

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 5, 2024

epage added a commit to epage/cargo that referenced this pull request Jan 6, 2024

chore: Add dependency dashboard

a93f4d8

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).

epage mentioned this pull request Jan 6, 2024

chore: Add dependency dashboard #13255

Merged

epage mentioned this pull request Jan 8, 2024

chore(ci): Shot-in-the-dark fix for MSRV updating #13265

Merged

bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 10, 2024

weihanglo marked this pull request as draft January 10, 2024 21:50

weihanglo mentioned this pull request Jan 17, 2024

home: reduce MSRV to 1.64 #13270

Closed

taiki-e mentioned this pull request Jan 17, 2024

Fix handling of glob members in --no-private taiki-e/cargo-hack#228

Merged

weihanglo added 2 commits January 24, 2024 17:33

chore: remove version field from publish=false packages

24c00a3

In 1.75 cargo allows versionless manifest. We should keep up and dogfood ourselves.

chore(ci): cargo-hack --no-private

55b72ab

--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 January 24, 2024 22:36

rustbot added the A-documenting-cargo-itself Area: Cargo's documentation label Jan 24, 2024

taiki-e reviewed Jan 25, 2024

View reviewed changes

.github/workflows/main.yml Outdated Show resolved Hide resolved

weihanglo force-pushed the versionless branch from 0f2c2f1 to 45e9d9a Compare January 25, 2024 01:55

weihanglo and others added 2 commits January 24, 2024 21:18

docs(ci): also suggest cargo hack --no-private

ebb7ff4

weihanglo force-pushed the versionless branch from 45e9d9a to ebb7ff4 Compare January 25, 2024 02:18

weihanglo marked this pull request as ready for review January 25, 2024 02:43

weihanglo marked this pull request as draft January 25, 2024 03:28

weihanglo closed this May 16, 2024

weihanglo deleted the versionless branch May 16, 2024 04:17

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: remove `version` field from `publish=false` packages #13254

chore: remove `version` field from `publish=false` packages #13254

weihanglo commented Jan 5, 2024

rustbot commented Jan 5, 2024

epage commented Jan 5, 2024

bors commented Jan 5, 2024

bors commented Jan 5, 2024

weihanglo commented Jan 5, 2024

bors commented Jan 5, 2024

weihanglo commented Jan 10, 2024

bors commented Jan 10, 2024

bors commented Jan 10, 2024

epage commented Jan 10, 2024

taiki-e commented Jan 17, 2024 •

edited

Loading

--no-private

taiki-e commented Jan 17, 2024

taiki-e commented Jan 17, 2024

bors commented Jan 19, 2024

epage commented Jan 20, 2024

taiki-e commented Jan 24, 2024

weihanglo commented Jan 25, 2024

epage commented Jan 25, 2024

weihanglo commented Jan 25, 2024

bors commented Mar 3, 2024

weihanglo commented May 16, 2024

chore: remove version field from publish=false packages #13254

chore: remove version field from publish=false packages #13254

Conversation

weihanglo commented Jan 5, 2024

What does this PR try to resolve?

How should we test and review this PR?

Additional information

rustbot commented Jan 5, 2024

epage commented Jan 5, 2024

bors commented Jan 5, 2024

bors commented Jan 5, 2024

weihanglo commented Jan 5, 2024

bors commented Jan 5, 2024

weihanglo commented Jan 10, 2024

bors commented Jan 10, 2024

bors commented Jan 10, 2024

epage commented Jan 10, 2024

taiki-e commented Jan 17, 2024 • edited Loading

--no-private

taiki-e commented Jan 17, 2024

taiki-e commented Jan 17, 2024

bors commented Jan 19, 2024

epage commented Jan 20, 2024

taiki-e commented Jan 24, 2024

weihanglo commented Jan 25, 2024

epage commented Jan 25, 2024

weihanglo commented Jan 25, 2024

bors commented Mar 3, 2024

weihanglo commented May 16, 2024

chore: remove `version` field from `publish=false` packages #13254

chore: remove `version` field from `publish=false` packages #13254

taiki-e commented Jan 17, 2024 •

edited

Loading