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

Move the version number to a plaintext file #76878

Merged
merged 1 commit into from
Sep 20, 2020

Conversation

pietroalbini
Copy link
Member

The Rust version number is currently embedded in bootstrap's source code, which makes it hard to update it automatically or access it outside of ./x.py (as you'd have to parse the source code).

This PR moves the version number to a standalone plaintext file, which makes accessing or updating it trivial.

r? @Mark-Simulacrum

The Rust version number is currently embedded in bootstrap's source
code, which makes it hard to update it automatically or access it
outside of ./x.py (as you'd have to parse the source code).

This commit moves the version number to a standalone plaintext file,
which makes accessing or updating it trivial.
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 18, 2020
@Mark-Simulacrum
Copy link
Member

This will need an adjustment to triagebot (around https://github.com/rust-lang/triagebot/blob/master/src/handlers/milestone_prs.rs#L60) to look for the new file.

There's probably two solutions there:

  • Update triagebot to look at both locations (this makes sure beta/stable PRs will also continue to work)
  • Land this PR, but leave the version number in channel.rs for several more cycles, until the plain text file is present on all channels.
  • Just switch triagebot to look at the new file, and don't worry about beta/stable PRs. We can do this in two steps, landing this with the channel.rs version still present, updating triagebot, and then deleting the channel.rs version in a follow-up PR.

@pietroalbini
Copy link
Member Author

@est31 this is not about src/stage0.txt, but the version of Rust itself. I'm not sure how that would integrate with rustup-toolchain.

@est31
Copy link
Member

est31 commented Sep 18, 2020

@pietroalbini yeah I confused the two. Nevermind!

@Mark-Simulacrum
Copy link
Member

@bors r+

Can you also follow-up with an update to the release process on forge?

@bors
Copy link
Contributor

bors commented Sep 18, 2020

📌 Commit b9af3e3 has been approved by Mark-Simulacrum

@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 Sep 18, 2020
@jyn514 jyn514 added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Sep 18, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Sep 19, 2020
…crum

Move the version number to a plaintext file

The Rust version number is currently embedded in bootstrap's source code, which makes it hard to update it automatically or access it outside of ./x.py (as you'd have to parse the source code).

This PR moves the version number to a standalone plaintext file, which makes accessing or updating it trivial.

r? @Mark-Simulacrum
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Sep 19, 2020
…crum

Move the version number to a plaintext file

The Rust version number is currently embedded in bootstrap's source code, which makes it hard to update it automatically or access it outside of ./x.py (as you'd have to parse the source code).

This PR moves the version number to a standalone plaintext file, which makes accessing or updating it trivial.

r? @Mark-Simulacrum
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Sep 19, 2020
…crum

Move the version number to a plaintext file

The Rust version number is currently embedded in bootstrap's source code, which makes it hard to update it automatically or access it outside of ./x.py (as you'd have to parse the source code).

This PR moves the version number to a standalone plaintext file, which makes accessing or updating it trivial.

r? @Mark-Simulacrum
RalfJung added a commit to RalfJung/rust that referenced this pull request Sep 20, 2020
…crum

Move the version number to a plaintext file

The Rust version number is currently embedded in bootstrap's source code, which makes it hard to update it automatically or access it outside of ./x.py (as you'd have to parse the source code).

This PR moves the version number to a standalone plaintext file, which makes accessing or updating it trivial.

r? @Mark-Simulacrum
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 20, 2020
Rollup of 15 pull requests

Successful merges:

 - rust-lang#76732 (Add docs for `BasicBlock`)
 - rust-lang#76832 (Let backends define custom targets)
 - rust-lang#76866 (Remove unused feature gates from library/ crates)
 - rust-lang#76875 (Move to intra-doc links in library/alloc/src/collections/binary_heap.rs)
 - rust-lang#76876 (Move to intra-doc links in collections/btree/map.rs and collections/linked_list.rs)
 - rust-lang#76877 (Move to intra-doc links in collections/vec_deque.rs and collections/vec_deque/drain.rs)
 - rust-lang#76878 (Move the version number to a plaintext file)
 - rust-lang#76883 (README.md: Remove prompts from code blocks)
 - rust-lang#76887 (Add missing examples on HashSet iter types)
 - rust-lang#76890 (use matches!() macro for simple if let conditions)
 - rust-lang#76891 (don't take `TyCtxt` by reference)
 - rust-lang#76910 (transmute: use diagnostic item)
 - rust-lang#76924 (Add tracking issue for feature(unix_socket_peek))
 - rust-lang#76926 (BTreeMap: code readability tweaks)
 - rust-lang#76940 (Don't allow implementing trait directly on type-alias-impl-trait)

Failed merges:

r? `@ghost`
@bors bors merged commit 24980b7 into rust-lang:master Sep 20, 2020
@rustbot rustbot added this to the 1.48.0 milestone Sep 20, 2020
@pietroalbini pietroalbini deleted the version branch September 20, 2020 18:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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) T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants