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

Bump to 1.72.0 #112023

Merged
merged 2 commits into from
May 28, 2023
Merged

Bump to 1.72.0 #112023

merged 2 commits into from
May 28, 2023

Conversation

Mark-Simulacrum
Copy link
Member

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-release Relevant to the release subteam, which will review and decide on the PR/issue. labels May 27, 2023
@Mark-Simulacrum
Copy link
Member Author

@bors r+ rollup=never p=1

@bors
Copy link
Contributor

bors commented May 27, 2023

📌 Commit 78acd5d has been approved by Mark-Simulacrum

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 May 27, 2023
@rust-log-analyzer

This comment has been minimized.

…67-version-issue, r=jyn514"

This reverts commit 9267843, reversing
changes made to e52fbff.

This breaks our ability to bump the src/version where we're bootstrapping with an older compiler
than usual (according to version number). It's not clear whether the intended use case has a clean
solution given this constraint, so reverting for now - we can reland with a fix of some kind implemented.
@rustbot rustbot added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label May 27, 2023
@Mark-Simulacrum
Copy link
Member Author

cc @jyn514 @chenyukang -- reverting #111538 for now, it breaks our ability to do bumps (added a note to the revert commit message). Happy to see that re-land but we need to proceed with the release right now.

@Mark-Simulacrum
Copy link
Member Author

@bors r+

@bors
Copy link
Contributor

bors commented May 27, 2023

📌 Commit 0809338 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@jyn514
Copy link
Member

jyn514 commented May 27, 2023

that's fine to revert for now, yeah.

This breaks our ability to bump the src/version where we're bootstrapping with an older compiler
than usual (according to version number)

ah hmm, I guess the problem is that for a ~week we're building 1.72 nightly with 1.70 beta? I wonder if we could have some field in config.toml that explicitly opts in to allowing it to be 2 versions apart instead of 1, and disable it once we bump to 1.71 beta.

anyway, we can worry about that after this merges.

@bors
Copy link
Contributor

bors commented May 27, 2023

⌛ Testing commit 0809338 with merge 9291627...

@Mark-Simulacrum
Copy link
Member Author

Well, it would be something like a change in defaults during the period at least - which feels hacky. I'm not sure it adds enough value for the hassle.

I guess we could try to only do this when building from source tarballs or something like that, if I understood the original issue correctly, that should mitigate most of the pain. Building in-tree with stage0.json compilers isn't really a case where you have a problem. (Though there's not a trivial conditional, because it's totally valid to build the nightly artifacts from the source tarballs during this week).

@jyn514
Copy link
Member

jyn514 commented May 27, 2023

ah! that's a great point, we can just turn this check off altogether when rustc is unset and we're using stage0.json, i think that should help all the cases of the original issue without adding a maintenance burden :)

@chenyukang
Copy link
Member

I will add a fix to the original PR.

@bors
Copy link
Contributor

bors commented May 28, 2023

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 9291627 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 28, 2023
@bors bors merged commit 9291627 into rust-lang:master May 28, 2023
@rustbot rustbot added this to the 1.72.0 milestone May 28, 2023
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (9291627): comparison URL.

Overall result: ❌✅ regressions and improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
0.3% [0.3%, 0.3%] 1
Improvements ✅
(primary)
-0.5% [-0.5%, -0.5%] 1
Improvements ✅
(secondary)
-0.4% [-0.4%, -0.4%] 2
All ❌✅ (primary) -0.5% [-0.5%, -0.5%] 1

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
2.2% [2.2%, 2.2%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.8% [-3.2%, -2.4%] 2
All ❌✅ (primary) - - 0

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
2.0% [2.0%, 2.0%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 646.258s -> 645.492s (-0.12%)

@Mark-Simulacrum Mark-Simulacrum deleted the bump-version branch May 29, 2023 12:15
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jun 3, 2023
…on-issue, r=jyn514

Make sure the build.rustc version is either the same or 1 apart (revised)

rust-lang#111538 is reverted in rust-lang#112023.

This PR will only check `build.rustc` to confirm the correct version.
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jun 3, 2023
…on-issue, r=jyn514

Make sure the build.rustc version is either the same or 1 apart (revised)

rust-lang#111538 is reverted in rust-lang#112023.

This PR will only check `build.rustc` to confirm the correct version.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-release Relevant to the release subteam, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants