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.

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

[beta-1.70] backport #12165 #12167

Closed
wants to merge 3 commits into from

Conversation

weihanglo
Copy link
Member

@weihanglo weihanglo commented May 22, 2023

Beta backports:

In order to make CI pass, the following PRs are also cherry-picked:

@rustbot
Copy link
Collaborator

rustbot commented May 22, 2023

r? @epage

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

@rustbot
Copy link
Collaborator

rustbot commented May 22, 2023

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against rust-1.70.0. Please double check that you specified the right target!

@rustbot rustbot added A-profiles Area: profiles S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 22, 2023
The weakening of debuginfo for build script shouldn't turn debuginfo
to `DebugInfo::None`. That will result in not passing `-C debuginfo=0`
to rustc, leading to build artifact cache miss.
@rustbot rustbot added A-build-execution Area: anything dealing with executing the compiler A-testing-cargo-itself Area: cargo's tests A-unstable Area: nightly unstable support labels May 22, 2023
@weihanglo
Copy link
Member Author

@bors try

@bors
Copy link
Contributor

bors commented May 23, 2023

⌛ Trying commit cb0bdbb with merge dbfcbf4...

bors added a commit that referenced this pull request May 23, 2023
[beta-1.70] backport #12165

Beta backports:

- #12165
  - Adjusted a bit since `TomlDebugInfo::None` was not there in 1.70.0. It was a simple u32 `0`.

In order to make CI pass, the following PRs are also cherry-picked:

- #12136
@weihanglo
Copy link
Member Author

https://github.com/rust-lang/cargo/actions/runs/5057792442/jobs/9077009414?pr=12167

-Zbuild-std failed. This is going to be painful. The fix of build-std shouldn't be backported but without a backport we cannot bypass the CI pipeline. I guess the obvious way is running build-std only when the PR aims to merging into master. Let's see how to solve this.

@ehuss
Copy link
Contributor

ehuss commented May 23, 2023

The fix of build-std shouldn't be backported but without a backport we cannot bypass the CI pipeline

Can you say why not? I would imagine backporting #12088 should be fine.

I guess the obvious way is running build-std only when the PR aims to merging into master. Let's see how to solve this.

It seems reasonable to stop running nightly tests on beta/stable. It might be a little tricky to do it correctly in CI due to the way bors works, so I'm not sure how that can be done.

@weihanglo
Copy link
Member Author

The fix of build-std shouldn't be backported but without a backport we cannot bypass the CI pipeline

Can you say why not? I would imagine backporting #12088 should be fine.

libsysroot only exists in nightly right now. I didn't think about it much but I believe some stuff like library/sysroot directooy cannot be found on beta and it may fail something.

I guess the obvious way is running build-std only when the PR aims to merging into master. Let's see how to solve this.

It seems reasonable to stop running nightly tests on beta/stable. It might be a little tricky to do it correctly in CI due to the way bors works, so I'm not sure how that can be done.

Yeah I've tried but no luck. bors knows nothing about branches on rust-lang/cargo 😞.

@ehuss
Copy link
Contributor

ehuss commented May 23, 2023

libsysroot only exists in nightly right now. I didn't think about it much but I believe some stuff like library/sysroot directooy cannot be found on beta and it may fail something.

The build-std tests are disabled on stable and beta, so I don't think it should be a concern. The only place they run is in Cargo's CI on the nightly builders, and those are always using the latest nightly. These tests don't run on rust-lang/rust, so it isn't a concern there.

@ehuss
Copy link
Contributor

ehuss commented May 27, 2023

I think it might be a bit too late to get this into beta. It's not clear to me how likely it is that a project will run into this issue. If you think it is sufficiently rare, then this should probably be closed.

@rust-lang rust-lang locked and limited conversation to collaborators May 27, 2023
@rust-lang rust-lang unlocked this conversation May 27, 2023
@weihanglo weihanglo closed this May 27, 2023
@weihanglo weihanglo deleted the beta-backport branch May 27, 2023 19:26
@weihanglo
Copy link
Member Author

Yup sure. Given they already have some workaround I think it's fine just closing this.

Actually I was waiting for #12181. Still want it or something else to get landed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-build-execution Area: anything dealing with executing the compiler A-profiles Area: profiles A-testing-cargo-itself Area: cargo's tests A-unstable Area: nightly unstable support S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants