Bump to 1.84 #131560

It looks like rust.download-rustc=if-unchanged activated, not accounting for the version change. So ver_cfg_rel("-1") tried 1.83 per the new src/version = 1.84, but the downloaded compiler was 1.83 -- assumed incomplete.

slanterns · 2024-10-13T07:47:25Z

Maybe that's because of 1090d89#diff-5f5330cfcdb0a89b85ac3547b761c3a45c2534a85c4aaae8fea88c711a7a65b2R2738? Seems only compiler and library folders are counted.

rustbot · 2024-10-13T07:48:25Z

This PR modifies src/bootstrap/src/core/config.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs.

cuviper · 2024-10-13T07:50:22Z

src/bootstrap/src/core/config/config.rs

@@ -2780,7 +2780,7 @@ impl Config {
        let has_changes = !t!(helpers::git(Some(&self.src))
            .args(["diff-index", "--quiet", &commit])
            .arg("--")
-            .args([self.src.join("compiler"), self.src.join("library")])
+            .args([self.src.join("compiler"), self.src.join("library"), self.src.join("version")])


This is the spot I found, but there may be multiple places that need to notice it.

Should it be src/version?

Bah, not that simple -- it's failing again:
https://github.com/rust-lang-ci/rust/actions/runs/11312606957/job/31460221821#step:26:2845

Should it be src/version?

Ah, in my haste I thought self.src already included that. But it's late for me, so I'll check back tomorrow.

Should it be src/version?

Ah, in my haste I thought self.src already included that. But it's late for me, so I'll check back tomorrow.

Yeah, and FYI in #131560 (comment) there is a more recent change (which I think is more suspicious).

My personal preference for now would be to disable this logic entirely (i.e., never use the downloaded rustc on CI), to remove any risk for the upcoming release.

It's not used in dist runners.

The logic was fatally wrong and had to be fixed 2 times already within less than a week (by missing files or folders that have to be checked for changes). If that's not very clear evidence that this is very fragile, I don't know what is.

It was never tested on CI before and I think this is quite normal. But sure, I understand your concern.

We have a test that checks if "if-unchanged" logic acts as expected when there is change in "compiler" tree,

What you'd need is a test which checks that if there is any change outside the "compiler" tree, nothing about the compiler changes. That would ensure that the logic is correct, and would have caught this problem. But of course that's basically impossible -- and without such a check, any mistake in the "list of folders to check" will cause subtle breakage.

It's not used in dist runners.

I don't see how that's sufficient. It's not like the other runners are irrelevant.

It was never tested on CI before and I think this is quite normal.

I think it is a symptom of fragile design. More robust alternatives are possible and I'd like to known whether they have been considered. See #131658.

Also, 3 days before a beta branch is a very bad time to land something where you think it is "normal" that it completely breaks CI for other PRs. (But this particular issue with the version file, would not have been caught by landing this earlier in a cycle. It would have been avoided by a less fragile design, though.)

Here is my fix attempt, maybe you would like to try that here (or should I file a PR?).

It's tricky since this PR will cut off what goes into 1.83-beta -- which won't see any more version changes, but will see channel and stage0 changes. But I can cherry-pick it when I do that branch promotion, so I think for now I'll just add it here to get the release train on track. Thanks!

These files have important role for compiler builds, so include them in the "if-unchanged" rustc logic. Signed-off-by: onur-ozkan <work@onurozkan.dev>

cuviper · 2024-10-13T14:49:29Z

@bors try

bors · 2024-10-13T14:50:39Z

⌛ Trying commit 6e6cbdd with merge 351e7d4...

Bump to 1.84 https://forge.rust-lang.org/release/process.html#bump-the-stable-version-number-t-6-days-friday-the-week-before r? ghost try-job: aarch64-apple

bors · 2024-10-13T16:00:15Z

☀️ Try build successful - checks-actions
Build commit: 351e7d4 (351e7d4c03aeaf7e5e888e4f158cb8e6aef2c435)

cuviper · 2024-10-13T16:02:31Z

Let's get this release train moving...

@bors r+ p=10

bors · 2024-10-13T16:02:33Z

📌 Commit 6e6cbdd has been approved by cuviper

It is now in the queue for this repository.

Bump to 1.84 https://forge.rust-lang.org/release/process.html#bump-the-stable-version-number-t-6-days-friday-the-week-before r? ghost

bors · 2024-10-13T16:35:30Z

⌛ Testing commit 6e6cbdd with merge 9cbaf4e...

rust-log-analyzer · 2024-10-13T18:14:13Z

The job x86_64-msvc-ext failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

[RUSTC-TIMING] miri test:false 5.616
error: failed to remove file `C:\a\rust\rust\build\x86_64-pc-windows-msvc\stage1-tools\x86_64-pc-windows-msvc\release\miri.exe`

Caused by:
  Access is denied. (os error 5)
Command has failed. Rerun with -v to see more details.
  local time: Sun, Oct 13, 2024  6:13:58 PM
  network time: Sun, 13 Oct 2024 18:13:59 GMT
##[error]Process completed with exit code 1.
Post job cleanup.

bors · 2024-10-13T18:14:54Z

💔 Test failed - checks-actions

cuviper · 2024-10-13T18:16:51Z

@bors retry

bors · 2024-10-13T20:09:00Z

⌛ Testing commit 6e6cbdd with merge 27861c4...

bors · 2024-10-13T22:37:38Z

☀️ Test successful - checks-actions
Approved by: cuviper
Pushing 27861c4 to master...

rust-timer · 2024-10-14T00:34:11Z

Finished benchmarking commit (27861c4): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

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

Max RSS (memory usage)

Results (primary -3.2%)

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)	-	-	0
Improvements ✅ (primary)	-3.2%	[-3.2%, -3.2%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-3.2%	[-3.2%, -3.2%]	1

Cycles

Results (secondary 2.8%)

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)	3.7%	[2.1%, 5.3%]	6
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.9%	[-2.9%, -2.9%]	1
All ❌✅ (primary)	-	-	0

Binary size

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

Bootstrap: 781.427s -> 782.891s (0.19%)
Artifact size: 331.96 MiB -> 332.14 MiB (0.05%)

Bump to 1.84

734481c

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 Oct 11, 2024

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 Oct 11, 2024

bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 12, 2024

Auto merge of rust-lang#131560 - cuviper:start-1.84, r=cuviper

5dfdba2

Bump to 1.84 https://forge.rust-lang.org/release/process.html#bump-the-stable-version-number-t-6-days-friday-the-week-before r? ghost

This comment has been minimized.

Sign in to view

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 Oct 12, 2024

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 Oct 12, 2024

cuviper mentioned this pull request Oct 12, 2024

Update LLVM submodule #131448

Merged

bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 13, 2024

Auto merge of rust-lang#131560 - cuviper:start-1.84, r=cuviper

36ffc08

Bump to 1.84 https://forge.rust-lang.org/release/process.html#bump-the-stable-version-number-t-6-days-friday-the-week-before r? ghost

This comment has been minimized.

Sign in to view

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 Oct 13, 2024

rustbot added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Oct 13, 2024

cuviper commented Oct 13, 2024

View reviewed changes

cuviper force-pushed the start-1.84 branch from 027c93a to 734481c Compare October 13, 2024 07:59

This comment has been minimized.

Sign in to view

jieyouxu mentioned this pull request Oct 13, 2024

Refactor change detection for rustdoc and download-rustc #131043

Merged

RalfJung mentioned this pull request Oct 13, 2024

download-rustc=if-unchanged logic is too fragile #131658

Closed

check stage0, channel and version files for CI rustc

6e6cbdd

These files have important role for compiler builds, so include them in the "if-unchanged" rustc logic. Signed-off-by: onur-ozkan <work@onurozkan.dev>

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 Oct 13, 2024

bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 13, 2024

Auto merge of rust-lang#131560 - cuviper:start-1.84, r=cuviper

9cbaf4e

Bump to 1.84 https://forge.rust-lang.org/release/process.html#bump-the-stable-version-number-t-6-days-friday-the-week-before r? ghost

tgross35 mentioned this pull request Oct 13, 2024

Stabilize const_option #131120

Merged

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 Oct 13, 2024

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 Oct 13, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 13, 2024

bors merged commit 27861c4 into rust-lang:master Oct 13, 2024
7 checks passed

rustbot added this to the 1.84.0 milestone Oct 13, 2024

cuviper deleted the start-1.84 branch October 13, 2024 23:23

Bump to 1.84 #131560

Bump to 1.84 #131560

Conversation

cuviper commented Oct 11, 2024 • edited Loading

cuviper commented Oct 11, 2024

bors commented Oct 11, 2024

cuviper commented Oct 11, 2024

bors commented Oct 12, 2024

This comment has been minimized.

bors commented Oct 12, 2024

cuviper commented Oct 12, 2024

bors commented Oct 13, 2024

This comment has been minimized.

bors commented Oct 13, 2024

RalfJung commented Oct 13, 2024

cuviper commented Oct 13, 2024

slanterns commented Oct 13, 2024 • edited Loading

rustbot commented Oct 13, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

slanterns Oct 13, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

RalfJung Oct 13, 2024 • edited Loading

Choose a reason for hiding this comment

RalfJung Oct 13, 2024 • edited Loading

Choose a reason for hiding this comment

RalfJung Oct 13, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

This comment has been minimized.

cuviper commented Oct 13, 2024

bors commented Oct 13, 2024

bors commented Oct 13, 2024

cuviper commented Oct 13, 2024

bors commented Oct 13, 2024

bors commented Oct 13, 2024

rust-log-analyzer commented Oct 13, 2024

bors commented Oct 13, 2024

cuviper commented Oct 13, 2024

bors commented Oct 13, 2024

bors commented Oct 13, 2024

rust-timer commented Oct 14, 2024

Overall result: ❌ regressions - no action needed

cuviper commented Oct 11, 2024 •

edited

Loading

slanterns commented Oct 13, 2024 •

edited

Loading

slanterns Oct 13, 2024 •

edited

Loading

RalfJung Oct 13, 2024 •

edited

Loading

RalfJung Oct 13, 2024 •

edited

Loading

RalfJung Oct 13, 2024 •

edited

Loading