Allow configuring the parent GitHub repository #117122

pietroalbini · 2023-10-24T10:16:11Z

The git integration in build_helper hardcoded rust-lang/rust as the parent GitHub repository, and master as the branch name. This works great for rust-lang/rust, but causes problems in downstream forks like Ferrocene whenever those functions are invoked (like ./x fmt).

In src/stage0.json there was already a configuration key for the name of the nightly branch, but it wasn't used by build_helper. This PR adds the github_repository key to the file, and requires both values to be passed to build_helper whenever a git function is called. This will allow downstream forks to tweak the values.

The git integration in build_helper hardcoded `rust-lang/rust` as the parent GitHub repository, and `master` as the branch name. This works great for `rust-lang/rust`, but causes problems in downstream forks like Ferrocene whenever those functions are invoked (like `./x fmt`). In `src/stage0.json` there was already a configuration key for the name of the nightly branch, but it wasn't used by build_helper. This commit adds the `github_repository` key to the file, and requires both values to be passed to build_helper whenever a git function is called. This will allow downstream forks to tweak the values.

rustbot · 2023-10-24T10:16:19Z

r? @albertlarsan68

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

rustbot · 2023-10-24T10:16:22Z

This PR modifies src/bootstrap/src/core/config. If appropriate, please also update CONFIG_CHANGE_HISTORY in src/bootstrap/src/lib.rs and change-id in config.example.toml.

This PR changes how LLVM is built. Consider updating src/bootstrap/download-ci-llvm-stamp.

albertlarsan68 · 2023-10-24T10:27:44Z

This is a good idea, thanks!
Can you update config.example.toml with the default values and explanation about the new config?

rustbot · 2023-10-24T10:46:31Z

This PR changes how LLVM is built. Consider updating src/bootstrap/download-ci-llvm-stamp.

This PR modifies src/bootstrap/src/core/config. If appropriate, please also update CONFIG_CHANGE_HISTORY in src/bootstrap/src/lib.rs and change-id in config.example.toml.

pietroalbini · 2023-10-24T10:48:53Z

Can you update config.example.toml with the default values and explanation about the new config?

Right now the configuration is not in config.toml/config.example.toml, but in src/stage0.json, for two reasons:

nightly_branch was already there, so I added github_repository alongside it.
This is not really a configuration the user should set, but a configuration of the repository/fork itself. It should work without users having to set any config value when cloning Ferrocene (or any other fork of the compiler). I agree src/stage0.json is suboptimal for this, but there is no other place like that right now.

albertlarsan68 · 2023-10-24T15:41:25Z

My bad, I was thinking it was an option in config.toml.
I'll review this when I have the time

albertlarsan68

LGTM, I would prefer if github_repository was renamed to git_repository.
r=me with the change

pietroalbini · 2023-11-06T14:54:14Z

@bors r=albertlarsan68

bors · 2023-11-06T14:54:16Z

📌 Commit 580fa0c has been approved by albertlarsan68

It is now in the queue for this repository.

bors · 2023-11-06T16:12:53Z

⌛ Testing commit 580fa0c with merge 2f0d41a...

…lbertlarsan68 Allow configuring the parent GitHub repository The git integration in build_helper hardcoded `rust-lang/rust` as the parent GitHub repository, and `master` as the branch name. This works great for `rust-lang/rust`, but causes problems in downstream forks like Ferrocene whenever those functions are invoked (like `./x fmt`). In `src/stage0.json` there was already a configuration key for the name of the nightly branch, but it wasn't used by build_helper. This PR adds the `github_repository` key to the file, and requires both values to be passed to build_helper whenever a git function is called. This will allow downstream forks to tweak the values.

bors · 2023-11-06T16:16:44Z

💔 Test failed - checks-actions

…=albertlarsan68 Allow configuring the parent GitHub repository The git integration in build_helper hardcoded `rust-lang/rust` as the parent GitHub repository, and `master` as the branch name. This works great for `rust-lang/rust`, but causes problems in downstream forks like Ferrocene whenever those functions are invoked (like `./x fmt`). In `src/stage0.json` there was already a configuration key for the name of the nightly branch, but it wasn't used by build_helper. This PR adds the `github_repository` key to the file, and requires both values to be passed to build_helper whenever a git function is called. This will allow downstream forks to tweak the values.

pietroalbini · 2023-11-09T13:45:09Z

@bors r=albertlarsan68

bors · 2023-11-09T13:45:12Z

📌 Commit 488dd9b has been approved by albertlarsan68

It is now in the queue for this repository.

bors · 2023-11-09T16:49:31Z

⌛ Testing commit 488dd9b with merge 4c8862b...

bors · 2023-11-09T19:15:51Z

☀️ Test successful - checks-actions
Approved by: albertlarsan68
Pushing 4c8862b to master...

rust-timer · 2023-11-09T22:26:36Z

Finished benchmarking commit (4c8862b): 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.

	mean	range	count
Regressions ❌ (primary)	0.8%	[0.6%, 1.0%]	5
Regressions ❌ (secondary)	4.4%	[4.4%, 4.4%]	1
Improvements ✅ (primary)	-0.7%	[-1.2%, -0.4%]	7
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.1%	[-1.2%, 1.0%]	12

Cycles

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.

	mean	range	count
Regressions ❌ (primary)	0.7%	[0.7%, 0.7%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.7%	[0.7%, 0.7%]	1

Binary size

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

Bootstrap: 662.476s -> 663.173s (0.11%)
Artifact size: 308.77 MiB -> 308.78 MiB (0.00%)

rustbot assigned albertlarsan68 Oct 24, 2023

This comment has been minimized.

Sign in to view

pass the correct args to compiletest

5a562d9

This comment has been minimized.

Sign in to view

update suggest-tests

4a08735

albertlarsan68 approved these changes Nov 5, 2023

View reviewed changes

albertlarsan68 added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 5, 2023

rename github_repository to git_repository

580fa0c

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 6, 2023

This comment has been minimized.

Sign in to view

bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Nov 6, 2023

bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 6, 2023

TaKO8Ki mentioned this pull request Nov 9, 2023

Rollup of 11 pull requests #117735

Closed

fmt

488dd9b

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 9, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 9, 2023

bors merged commit 4c8862b into rust-lang:master Nov 9, 2023
12 checks passed

rustbot added this to the 1.75.0 milestone Nov 9, 2023

tshepang deleted the pa-configure-git-diff branch November 10, 2023 06:25

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow configuring the parent GitHub repository #117122

Allow configuring the parent GitHub repository #117122

pietroalbini commented Oct 24, 2023

rustbot commented Oct 24, 2023

rustbot commented Oct 24, 2023

albertlarsan68 commented Oct 24, 2023

This comment has been minimized.

rustbot commented Oct 24, 2023

pietroalbini commented Oct 24, 2023

This comment has been minimized.

albertlarsan68 commented Oct 24, 2023

albertlarsan68 left a comment

pietroalbini commented Nov 6, 2023

bors commented Nov 6, 2023

This comment has been minimized.

bors commented Nov 6, 2023

This comment has been minimized.

bors commented Nov 6, 2023

pietroalbini commented Nov 9, 2023

bors commented Nov 9, 2023

bors commented Nov 9, 2023

bors commented Nov 9, 2023

rust-timer commented Nov 9, 2023

Allow configuring the parent GitHub repository #117122

Allow configuring the parent GitHub repository #117122

Conversation

pietroalbini commented Oct 24, 2023

rustbot commented Oct 24, 2023

rustbot commented Oct 24, 2023

albertlarsan68 commented Oct 24, 2023

This comment has been minimized.

rustbot commented Oct 24, 2023

pietroalbini commented Oct 24, 2023

This comment has been minimized.

albertlarsan68 commented Oct 24, 2023

albertlarsan68 left a comment

Choose a reason for hiding this comment

pietroalbini commented Nov 6, 2023

bors commented Nov 6, 2023

This comment has been minimized.

bors commented Nov 6, 2023

This comment has been minimized.

bors commented Nov 6, 2023

pietroalbini commented Nov 9, 2023

bors commented Nov 9, 2023

bors commented Nov 9, 2023

bors commented Nov 9, 2023

rust-timer commented Nov 9, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size