Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

test: Add test for packaging a public dependency #13536

Merged
merged 1 commit into from
Mar 5, 2024
Merged

test: Add test for packaging a public dependency #13536

merged 1 commit into from
Mar 5, 2024

Conversation

linyihai
Copy link
Contributor

@linyihai linyihai commented Mar 5, 2024

What does this PR try to resolve?

Add a test for packaging a public dependency.
if no -Zpublic-dependency, the rewrited Cargo.toml does not have public, but if it does, public is in the rewrited Cargo.toml.
According the test, it seems no need to unset public in prepare_for_publish

How should we test and review this PR?

Additional information

Address #13308

@rustbot
Copy link
Collaborator

rustbot commented Mar 5, 2024

r? @ehuss

rustbot has assigned @ehuss.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 5, 2024
@epage
Copy link
Contributor

epage commented Mar 5, 2024

@bors r+

@bors
Copy link
Contributor

bors commented Mar 5, 2024

📌 Commit cf45a5c has been approved by epage

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 Mar 5, 2024
@bors
Copy link
Contributor

bors commented Mar 5, 2024

⌛ Testing commit cf45a5c with merge 2bb6dc9...

bors added a commit that referenced this pull request Mar 5, 2024
@bors
Auto merge of #13536 - linyihai:package-pub-dep, r=epage
2bb6dc9 
test: Add test for packaging a public dependency

### What does this PR try to resolve?
Add a test for packaging a public dependency.
if no `-Zpublic-dependency`, the rewrited Cargo.toml does not have public, but if it does, public is in the rewrited Cargo.toml.
According the test, it seems no need to unset public in `prepare_for_publish`

### How should we test and review this PR?

### Additional information
Address #13308
@bors
Copy link
Contributor

bors commented Mar 5, 2024

💔 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 Mar 5, 2024
@ehuss
Copy link
Contributor

ehuss commented Mar 5, 2024

Test failure doesn't make sense to me.

2024-03-05T14:45:04.7061411Z ---- features2::dep_with_optional_host_deps_activated stdout ----
2024-03-05T14:45:04.7068796Z running `/home/runner/work/cargo/cargo/target/debug/cargo check`
2024-03-05T14:45:04.7071317Z thread 'features2::dep_with_optional_host_deps_activated' panicked at tests/testsuite/features2.rs:2628:10:
2024-03-05T14:45:04.7072281Z 
2024-03-05T14:45:04.7072821Z test failed running `/home/runner/work/cargo/cargo/target/debug/cargo check`
2024-03-05T14:45:04.7073996Z error: stderr did not match:
2024-03-05T14:45:04.7075266Z 1   1        Compiling serde_build v0.1.0 (/home/runner/work/cargo/cargo/target/tmp/cit/t1221/foo/serde_build)
2024-03-05T14:45:04.7077407Z 2        -   Compiling serde_derive v0.1.0 (/home/runner/work/cargo/cargo/target/tmp/cit/t1221/foo/serde_derive)
2024-03-05T14:45:04.7079054Z 3   2        Compiling serde v0.1.0 (/home/runner/work/cargo/cargo/target/tmp/cit/t1221/foo/serde)
2024-03-05T14:45:04.7080850Z     3    +   Compiling serde_derive v0.1.0 (/home/runner/work/cargo/cargo/target/tmp/cit/t1221/foo/serde_derive)
2024-03-05T14:45:04.7082590Z 4   4         Checking foo v0.1.0 (/home/runner/work/cargo/cargo/target/tmp/cit/t1221/foo)
2024-03-05T14:45:04.7083643Z 5   5         Finished `dev` profile [..]

I don't see how it is possible for the status messages to get out of order. serde requires serde_derive to be built first.

@bors retry

@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 Mar 5, 2024
@bors
Copy link
Contributor

bors commented Mar 5, 2024

⌛ Testing commit cf45a5c with merge ab1c0e5...

@bors
Copy link
Contributor

bors commented Mar 5, 2024

☀️ Test successful - checks-actions
Approved by: epage
Pushing ab1c0e5 to master...

@bors bors merged commit ab1c0e5 into rust-lang:master Mar 5, 2024
21 checks passed
@weihanglo weihanglo mentioned this pull request Mar 6, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 6, 2024
@bors
Auto merge of rust-lang#122054 - weihanglo:update-cargo, r=weihanglo
07a39aa 
Update cargo

11 commits in f772ec0224d3755ce52ac5128a80319fb2eb45d0..c3c417b85e01a1de1633317fa55e4f1a31e346d4
2024-03-01 22:57:35 +0000 to 2024-03-06 01:16:08 +0000
- fix(rustdoc-map): dedup `--extern-html-too-url` for same unit (rust-lang/cargo#13544)
- test: Add test for packaging a public dependency (rust-lang/cargo#13536)
- doc: Edits for git/path dependency sections (rust-lang/cargo#13341)
- feat(cli): Allow logging to chrome traces (rust-lang/cargo#13399)
- fix(log): Trace parameters to align with profile (rust-lang/cargo#13538)
- fix(toml): Don't warn on unset Edition if only 2015 is compatible (rust-lang/cargo#13533)
- fix(cli): Trace core cargo operations (rust-lang/cargo#13532)
- chore: update pulldown-cmark to 0.10.0 (rust-lang/cargo#13517)
- feat(add): Fallback to `rustc -v` when no MSRV is set (rust-lang/cargo#13516)
- chore(ci): Ensure lockfile is respected during MSRV testing (rust-lang/cargo#13523)
- feat: Use consistent colors when testing (rust-lang/cargo#13520)

r? ghost
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 7, 2024
@bors
Auto merge of rust-lang#122054 - weihanglo:update-cargo, r=weihanglo
1508a03 
Update cargo

14 commits in f772ec0224d3755ce52ac5128a80319fb2eb45d0..a4c63fe5388beaa09e5f91196c86addab0a03580
2024-03-01 22:57:35 +0000 to 2024-03-06 22:15:17 +0000
- fix(cli): Skip tracing-chrome for platforms without 64bit atomics (rust-lang/cargo#13551)
- chore: downgrade to openssl v1.1.1 (again) (rust-lang/cargo#13550)
- fix(cli): Add traces to clarify where time is going (rust-lang/cargo#13545)
- fix(rustdoc-map): dedup `--extern-html-too-url` for same unit (rust-lang/cargo#13544)
- test: Add test for packaging a public dependency (rust-lang/cargo#13536)
- doc: Edits for git/path dependency sections (rust-lang/cargo#13341)
- feat(cli): Allow logging to chrome traces (rust-lang/cargo#13399)
- fix(log): Trace parameters to align with profile (rust-lang/cargo#13538)
- fix(toml): Don't warn on unset Edition if only 2015 is compatible (rust-lang/cargo#13533)
- fix(cli): Trace core cargo operations (rust-lang/cargo#13532)
- chore: update pulldown-cmark to 0.10.0 (rust-lang/cargo#13517)
- feat(add): Fallback to `rustc -v` when no MSRV is set (rust-lang/cargo#13516)
- chore(ci): Ensure lockfile is respected during MSRV testing (rust-lang/cargo#13523)
- feat: Use consistent colors when testing (rust-lang/cargo#13520)
@rustbot rustbot added this to the 1.78.0 milestone Mar 7, 2024
@linyihai linyihai deleted the package-pub-dep branch March 7, 2024 07:33
lnicola pushed a commit to lnicola/rust-analyzer that referenced this pull request Apr 7, 2024
@bors
Auto merge of #122054 - weihanglo:update-cargo, r=weihanglo
0a760e2 
Update cargo

14 commits in f772ec0224d3755ce52ac5128a80319fb2eb45d0..a4c63fe5388beaa09e5f91196c86addab0a03580
2024-03-01 22:57:35 +0000 to 2024-03-06 22:15:17 +0000
- fix(cli): Skip tracing-chrome for platforms without 64bit atomics (rust-lang/cargo#13551)
- chore: downgrade to openssl v1.1.1 (again) (rust-lang/cargo#13550)
- fix(cli): Add traces to clarify where time is going (rust-lang/cargo#13545)
- fix(rustdoc-map): dedup `--extern-html-too-url` for same unit (rust-lang/cargo#13544)
- test: Add test for packaging a public dependency (rust-lang/cargo#13536)
- doc: Edits for git/path dependency sections (rust-lang/cargo#13341)
- feat(cli): Allow logging to chrome traces (rust-lang/cargo#13399)
- fix(log): Trace parameters to align with profile (rust-lang/cargo#13538)
- fix(toml): Don't warn on unset Edition if only 2015 is compatible (rust-lang/cargo#13533)
- fix(cli): Trace core cargo operations (rust-lang/cargo#13532)
- chore: update pulldown-cmark to 0.10.0 (rust-lang/cargo#13517)
- feat(add): Fallback to `rustc -v` when no MSRV is set (rust-lang/cargo#13516)
- chore(ci): Ensure lockfile is respected during MSRV testing (rust-lang/cargo#13523)
- feat: Use consistent colors when testing (rust-lang/cargo#13520)
RalfJung pushed a commit to RalfJung/rust-analyzer that referenced this pull request Apr 27, 2024
@bors
Auto merge of #122054 - weihanglo:update-cargo, r=weihanglo
a6f9708 
Update cargo

14 commits in f772ec0224d3755ce52ac5128a80319fb2eb45d0..a4c63fe5388beaa09e5f91196c86addab0a03580
2024-03-01 22:57:35 +0000 to 2024-03-06 22:15:17 +0000
- fix(cli): Skip tracing-chrome for platforms without 64bit atomics (rust-lang/cargo#13551)
- chore: downgrade to openssl v1.1.1 (again) (rust-lang/cargo#13550)
- fix(cli): Add traces to clarify where time is going (rust-lang/cargo#13545)
- fix(rustdoc-map): dedup `--extern-html-too-url` for same unit (rust-lang/cargo#13544)
- test: Add test for packaging a public dependency (rust-lang/cargo#13536)
- doc: Edits for git/path dependency sections (rust-lang/cargo#13341)
- feat(cli): Allow logging to chrome traces (rust-lang/cargo#13399)
- fix(log): Trace parameters to align with profile (rust-lang/cargo#13538)
- fix(toml): Don't warn on unset Edition if only 2015 is compatible (rust-lang/cargo#13533)
- fix(cli): Trace core cargo operations (rust-lang/cargo#13532)
- chore: update pulldown-cmark to 0.10.0 (rust-lang/cargo#13517)
- feat(add): Fallback to `rustc -v` when no MSRV is set (rust-lang/cargo#13516)
- chore(ci): Ensure lockfile is respected during MSRV testing (rust-lang/cargo#13523)
- feat: Use consistent colors when testing (rust-lang/cargo#13520)
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees

@ehuss ehuss

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

Successfully merging this pull request may close these issues.
5 participants
@linyihai @rustbot @epage @bors @ehuss