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

Set commit information environment variables when building tools #109981

Merged
merged 6 commits into from
Apr 18, 2023

Conversation

duckymirror
Copy link
Contributor

@duckymirror duckymirror commented Apr 5, 2023

This fixes #107094.
I'm trying to add a regression test for this issue.
Update: I've added a test and a new test header needs-git-hash which makes sure it doesn't run when commit hashes are ignored (bootstrap's ignore-git option).

@rustbot
Copy link
Collaborator

rustbot commented Apr 5, 2023

r? @albertlarsan68

(rustbot has picked a reviewer for you, use r? to override)

@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) A-testsuite Area: The testsuite used to check the correctness of rustc labels Apr 5, 2023
@duckymirror duckymirror marked this pull request as ready for review April 7, 2023 19:36
@bors
Copy link
Contributor

bors commented Apr 16, 2023

☔ The latest upstream changes (presumably #110319) made this pull request unmergeable. Please resolve the merge conflicts.

@albertlarsan68
Copy link
Member

Thanks for the PR!
@bors r+ rollup

@bors
Copy link
Contributor

bors commented Apr 17, 2023

📌 Commit 0a763c9 has been approved by albertlarsan68

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 Apr 17, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Apr 17, 2023
…larsan68

Set commit information environment variables when building tools

This fixes rust-lang#107094.
~I'm trying to add a regression test for this issue.~
**Update**: I've added a test and a new test header `needs-git-hash` which makes sure it doesn't run when commit hashes are ignored (`bootstrap`'s `ignore-git` option).
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Apr 17, 2023
…larsan68

Set commit information environment variables when building tools

This fixes rust-lang#107094.
~I'm trying to add a regression test for this issue.~
**Update**: I've added a test and a new test header `needs-git-hash` which makes sure it doesn't run when commit hashes are ignored (`bootstrap`'s `ignore-git` option).
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 18, 2023
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#109981 (Set commit information environment variables when building tools)
 - rust-lang#110348 (Add list of supported disambiguators and suffixes for intra-doc links in the rustdoc book)
 - rust-lang#110409 (Don't use `serde_json` to serialize a simple JSON object)
 - rust-lang#110442 (Avoid including dry run steps in the build metrics)
 - rust-lang#110450 (rustdoc: Fix invalid handling of nested items with `--document-private-items`)
 - rust-lang#110461 (Use `Item::expect_*` and `ImplItem::expect_*` more)
 - rust-lang#110465 (Assure everyone that `has_type_flags` is fast)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 06d403d into rust-lang:master Apr 18, 2023
@rustbot rustbot added this to the 1.71.0 milestone Apr 18, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc 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.

rustdoc --version --verbose no longer displays commit hashes + date since beta 1.67
4 participants