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

Revert #132772 to fix unknown git commit hash #132846

Merged
merged 2 commits into from
Nov 10, 2024

Conversation

jieyouxu
Copy link
Member

Reverts #132772 to address #132845, we seem to have unintentionally omitted commit hash.

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 Nov 10, 2024
@rustbot
Copy link
Collaborator

rustbot commented Nov 10, 2024

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

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

This PR modifies src/bootstrap/defaults.

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

@jieyouxu jieyouxu changed the title Revert "#132772" Revert #132772 to fix unknown git commit hash Nov 10, 2024
@RalfJung
Copy link
Member

@bors r+ p=10
(I'm not on the team, but this is just a revert, and we want to land it ASAP so it does not become part of the next nightly)

@bors
Copy link
Contributor

bors commented Nov 10, 2024

📌 Commit 5dbf135 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 Nov 10, 2024
@jieyouxu
Copy link
Member Author

Since queue is very light, I'm going to yield the other PR that just started.

@bors rollup=never

@bors
Copy link
Contributor

bors commented Nov 10, 2024

⌛ Testing commit 5dbf135 with merge 00c8722...

bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 10, 2024
Revert rust-lang#132772 to fix unknown git commit hash

Reverts rust-lang#132772 to address rust-lang#132845, we seem to have unintentionally omitted commit hash.

r? `@onur-ozkan`
@jieyouxu
Copy link
Member Author

I'm not on the team, but this is just a revert, and we want to land it ASAP so it does not become part of the next nightly

(I was going to self-approve as per revert policy but was double-checking queue, this works too 😆)

@rust-log-analyzer

This comment has been minimized.

@jieyouxu
Copy link
Member Author

jieyouxu commented Nov 10, 2024

Huh. This failed well because commit hash was unknown. I'll temporarily disable this test to get the revert through.

@bors
Copy link
Contributor

bors commented Nov 10, 2024

💔 Test failed - checks-actions

@bors 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 Nov 10, 2024
…default, r=jieyouxu"

This reverts commit c435fa8, reversing
changes made to 88acd49.

Seems to have unintentionally omitted commit hash leading to
<rust-lang#132772>.
@rustbot rustbot added the A-run-make Area: port run-make Makefiles to rmake.rs label Nov 10, 2024
@jieyouxu
Copy link
Member Author

I'll babysit this revert to make sure it goes through. Closing the tree temporarily to not have to keep yielding other PRs.

@bors p=50
@bors treeclosed=1000

@jieyouxu
Copy link
Member Author

@bors r+

@bors
Copy link
Contributor

bors commented Nov 10, 2024

📌 Commit c4c6d2b has been approved by jieyouxu

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Nov 10, 2024

🌲 The tree is currently closed for pull requests below priority 1000. This pull request will be tested once the tree is reopened.

@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 Nov 10, 2024
@jieyouxu
Copy link
Member Author

@bors p=1001

@bors
Copy link
Contributor

bors commented Nov 10, 2024

⌛ Testing commit c4c6d2b with merge c22887b...

@jieyouxu
Copy link
Member Author

jieyouxu commented Nov 10, 2024

PR to re-enable version-verbose-commit-hash after this revert PR lands: #132848

@RalfJung
Copy link
Member

PR to re-enable version-verbose-commit-hash after this revert PR lands: #132846

You meant #132848 I think :)

@RalfJung
Copy link
Member

The 2nd commit here can be reverted once #132852 landed.

@bors
Copy link
Contributor

bors commented Nov 10, 2024

☀️ Test successful - checks-actions
Approved by: jieyouxu
Pushing c22887b to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 10, 2024
@bors bors merged commit c22887b into rust-lang:master Nov 10, 2024
7 checks passed
@rustbot rustbot added this to the 1.84.0 milestone Nov 10, 2024
@RalfJung
Copy link
Member

@bors treeclosed-

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (c22887b): 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.1% [0.1%, 0.1%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.1% [0.1%, 0.1%] 1

Max RSS (memory usage)

Results (primary 2.0%, secondary -3.1%)

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)
2.0% [0.6%, 3.8%] 4
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-3.1% [-3.7%, -2.5%] 2
All ❌✅ (primary) 2.0% [0.6%, 3.8%] 4

Cycles

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

Binary size

Results (primary 0.1%, secondary 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)
0.1% [0.0%, 0.2%] 72
Regressions ❌
(secondary)
0.2% [0.0%, 0.8%] 65
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 0.1% [0.0%, 0.2%] 72

Bootstrap: 787.727s -> 787.115s (-0.08%)
Artifact size: 335.29 MiB -> 335.35 MiB (0.02%)

mati865 pushed a commit to mati865/rust that referenced this pull request Nov 12, 2024
Revert rust-lang#132772 to fix unknown git commit hash

Reverts rust-lang#132772 to address rust-lang#132845, we seem to have unintentionally omitted commit hash.

r? `@onur-ozkan`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-run-make Area: port run-make Makefiles to rmake.rs 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.

7 participants