Skip to content

Fix download of GCC from CI on non-nightly channels #140901

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

Merged
merged 1 commit into from
May 10, 2025

Conversation

Kobzol
Copy link
Contributor

@Kobzol Kobzol commented May 10, 2025

Fixes the download failure on beta (#140897 (comment)).

r? @onur-ozkan

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels May 10, 2025
Copy link
Member

@onur-ozkan onur-ozkan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM other than one question.

Comment on lines -855 to +856
let filename = format!("gcc-nightly-{}.tar.xz", self.build.triple);
let version = self.artifact_version_part(gcc_sha);
let filename = format!("gcc-{version}-{}.tar.xz", self.build.triple);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will this work fine on stable channels?

match channel.as_str() {
"stable" => version,
"beta" => channel,
"nightly" => channel,
other => unreachable!("{:?} is not recognized as a valid channel", other),
}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We use the exact same code for downloading LLVM and CI rustc, and the GCC dist component should produce the dist artifacts on all channels, so I think it should. But as usually, it's hard to be sure until we try.. 😆

@onur-ozkan
Copy link
Member

@bors r+ p=1

@bors
Copy link
Collaborator

bors commented May 10, 2025

📌 Commit 448b7af has been approved by onur-ozkan

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 10, 2025
@bors
Copy link
Collaborator

bors commented May 10, 2025

⌛ Testing commit 448b7af with merge 7b84c9e...

@bors
Copy link
Collaborator

bors commented May 10, 2025

☀️ Test successful - checks-actions
Approved by: onur-ozkan
Pushing 7b84c9e to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 10, 2025
@bors bors merged commit 7b84c9e into rust-lang:master May 10, 2025
7 checks passed
@rustbot rustbot added this to the 1.89.0 milestone May 10, 2025
Copy link

What is this? This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing dbab4e1 (parent) -> 7b84c9e (this PR)

Test differences

No test diffs found

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 7b84c9e9ca4b9c68c888b77762c31e180ee7af45 --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

  1. dist-aarch64-linux: 5288.2s -> 7803.5s (47.6%)
  2. dist-x86_64-apple: 7278.2s -> 10434.4s (43.4%)
  3. dist-apple-various: 5957.0s -> 8462.5s (42.1%)
  4. dist-aarch64-apple: 5567.4s -> 4905.5s (-11.9%)
  5. x86_64-apple-1: 7194.4s -> 6411.1s (-10.9%)
  6. x86_64-apple-2: 4360.5s -> 3940.6s (-9.6%)
  7. dist-various-1: 4353.6s -> 4710.4s (8.2%)
  8. dist-riscv64-linux: 5145.0s -> 5512.4s (7.1%)
  9. i686-gnu-1: 9080.8s -> 8457.3s (-6.9%)
  10. aarch64-gnu: 6447.4s -> 6794.2s (5.4%)
How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (7b84c9e): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

Max RSS (memory usage)

Results (primary 0.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)
1.9% [0.5%, 3.4%] 2
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.6% [-0.9%, -0.4%] 5
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.2% [-0.9%, 3.4%] 7

Cycles

Results (primary -0.6%, secondary 3.5%)

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.5% [2.9%, 4.1%] 2
Improvements ✅
(primary)
-0.6% [-0.6%, -0.6%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -0.6% [-0.6%, -0.6%] 1

Binary size

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

Bootstrap: 772.568s -> 771.777s (-0.10%)
Artifact size: 365.47 MiB -> 365.38 MiB (-0.03%)

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)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants