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

re-add git-commit-hash file to tarballs #102610

Merged
merged 1 commit into from
Oct 3, 2022
Merged

re-add git-commit-hash file to tarballs #102610

merged 1 commit into from
Oct 3, 2022

Conversation

dawnofmidnight
Copy link
Contributor

#100557 removed the git-commit-hash file and replaced it with git-commit-info. However, build-manifest relies on the git-commit-hash file being present, so this adds it back.

r? @Mark-Simulacrum

@rustbot rustbot added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Oct 3, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 3, 2022
@Mark-Simulacrum
Copy link
Member

I think there's another place not covered by this https://github.com/rust-lang/rust/pull/100557/files#diff-2f4b08d54e680939ebd8445ceb0f27755c515e62607519819ce4caa6fc74caa6L300 in tarball.rs. Can you check?

@dawnofmidnight
Copy link
Contributor Author

Hm, yeah you're right. When I tested with x dist rustc-src the file was generated, but I'm not entirely sure of the details of what tarball.rs does.

I can go ahead and fix that, though. I'll factor it out into a free function like the previous PR did to git-commit-info.

#100557 removed the `git-commit-hash` file and replaced it
with `git-commit-info`. However, build-manifest relies on the
`git-commit-hash` file being present, so this adds it back.
@Mark-Simulacrum
Copy link
Member

@bors r+ p=10

@bors
Copy link
Contributor

bors commented Oct 3, 2022

📌 Commit 5c908c6 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 Oct 3, 2022
@bors
Copy link
Contributor

bors commented Oct 3, 2022

⌛ Testing commit 5c908c6 with merge 33d3519...

@bors
Copy link
Contributor

bors commented Oct 3, 2022

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 3, 2022
@bors bors merged commit 33d3519 into rust-lang:master Oct 3, 2022
@rustbot rustbot added this to the 1.66.0 milestone Oct 3, 2022
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (33d3519): 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

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.

mean1 range count2
Regressions ❌
(primary)
1.8% [1.8%, 1.8%] 1
Regressions ❌
(secondary)
9.9% [9.9%, 9.9%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-4.7% [-5.0%, -4.5%] 2
All ❌✅ (primary) 1.8% [1.8%, 1.8%] 1

Cycles

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

Footnotes

  1. the arithmetic mean of the percent change

  2. number of relevant changes

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.

6 participants