Skip to content

Revert "add Cargo.lock to CI-rustc allowed list for non-CI env" #142344

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
Jun 11, 2025

Conversation

Kobzol
Copy link
Contributor

@Kobzol Kobzol commented Jun 11, 2025

This reverts commit c3de813 (#142232).

r? @RalfJung

Fixes: #142338
Unfixes: #141986

@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 Jun 11, 2025
@rustbot
Copy link
Collaborator

rustbot commented Jun 11, 2025

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

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

@RalfJung
Copy link
Member

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jun 11, 2025

📌 Commit 3a33dd6 has been approved by RalfJung

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 Jun 11, 2025
@jieyouxu
Copy link
Member

@bors p=10 (download-rustc issue, scheduling ahead of rollups)

@bors
Copy link
Collaborator

bors commented Jun 11, 2025

⌛ Testing commit 3a33dd6 with merge f77bb1b...

@bors
Copy link
Collaborator

bors commented Jun 11, 2025

☀️ Test successful - checks-actions
Approved by: RalfJung
Pushing f77bb1b to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 11, 2025
@bors bors merged commit f77bb1b into rust-lang:master Jun 11, 2025
11 checks passed
@rustbot rustbot added this to the 1.89.0 milestone Jun 11, 2025
Copy link
Contributor

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 bdb04d6 (parent) -> f77bb1b (this PR)

Test differences

No test diffs found

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard f77bb1b294a30efb73ff4845946a3aad0950cb83 --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-apple-various: 6205.4s -> 8229.9s (32.6%)
  2. dist-x86_64-apple: 7841.6s -> 10041.0s (28.0%)
  3. aarch64-apple: 4001.0s -> 4874.6s (21.8%)
  4. dist-sparcv9-solaris: 5811.4s -> 5025.9s (-13.5%)
  5. test-various: 5025.7s -> 4397.4s (-12.5%)
  6. x86_64-apple-2: 4958.9s -> 5577.0s (12.5%)
  7. aarch64-gnu-debug: 3970.2s -> 3480.5s (-12.3%)
  8. i686-gnu-1: 8294.9s -> 7371.9s (-11.1%)
  9. i686-gnu-nopt-1: 8143.3s -> 7254.6s (-10.9%)
  10. mingw-check-1: 1834.2s -> 1635.8s (-10.8%)
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 (f77bb1b): 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)

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

Cycles

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

Binary size

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

Bootstrap: 755.487s -> 754.591s (-0.12%)
Artifact size: 372.14 MiB -> 372.13 MiB (-0.00%)

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.

bootstrap uses downloaded rustc despite lockfile changes
6 participants