Skip to content

bootstrap.py: nixos check in /etc/os-release with quotes#95234

Merged
bors merged 1 commit intorust-lang:masterfrom
ben0x539:nixquotes
Apr 5, 2022
Merged

bootstrap.py: nixos check in /etc/os-release with quotes#95234
bors merged 1 commit intorust-lang:masterfrom
ben0x539:nixquotes

Conversation

@ben0x539
Copy link
Contributor

@ben0x539 ben0x539 commented Mar 23, 2022

Per https://www.freedesktop.org/software/systemd/man/os-release.html,

Variable assignment values must be enclosed in double or single quotes
if they include spaces, semicolons or other special characters outside
of A–Z, a–z, 0–9. (Assignments that do not include these special
characters may be enclosed in quotes too, but this is optional.)

So, past ID=nixos, let's also check for ID='nixos' and ID="nixos".

One of these is necessary between NixOS/nixpkgs#162168 and
NixOS/nixpkgs#164068, but this seems more correct either way.

@rust-highfive
Copy link
Contributor

rust-highfive commented Mar 23, 2022

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 23, 2022
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@ben0x539
bootstrap.py: nixos check in /etc/os-release with quotes
76756cc 
Per https://www.freedesktop.org/software/systemd/man/os-release.html,

> Variable assignment values must be enclosed in double or single quotes
> if they include spaces, semicolons or other special characters outside
> of A–Z, a–z, 0–9. (Assignments that do not include these special
> characters may be enclosed in quotes too, but this is optional.)

So, past `ID=nixos`, let's also check for `ID='nixos'` and `ID="nixos"`.

One of these is necessary between NixOS/nixpkgs#162168 and
NixOS/nixpkgs#164068, but this seems more correct either way.
@jyn514
Copy link
Member

jyn514 commented Mar 23, 2022 •
edited
Loading

Leaving a note for myself that I need to include this change in #95170.

(also, if you don't mind testing that change out, I would be extremely grateful.)

@ben0x539 ben0x539 mentioned this pull request Mar 23, 2022
Merged
@Dylan-DPC
Copy link
Member

Dylan-DPC commented Mar 26, 2022

@bors r+ rollup

@ben0x539
Copy link
Contributor Author

ben0x539 commented Apr 3, 2022

@bors plz

@eddyb
Copy link
Member

eddyb commented Apr 3, 2022

@bors r=Dylan-DPC rollup

@bors
Copy link
Collaborator

bors commented Apr 3, 2022

📌 Commit 76756cc has been approved by Dylan-DPC

@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 3, 2022
@bors
Copy link
Collaborator

bors commented Apr 3, 2022

⌛ Testing commit 76756cc with merge c9bdf267728f9981476788698e6b3a384fb80fc4...

@bors
Copy link
Collaborator

bors commented Apr 3, 2022

💔 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 Apr 3, 2022
@rust-log-analyzer
Copy link
Collaborator

rust-log-analyzer commented Apr 3, 2022

The job x86_64-gnu-tools failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
.......... (60/61)
          (61/61)


/checkout/src/test/rustdoc-gui/search-result-display.goml search-result-display... FAILED
[ERROR] (line 5) TimeoutError: waiting for selector "#search-settings" failed: timeout 30000ms exceeded: for command `wait-for: "#search-settings"`
Build completed unsuccessfully in 0:00:45

@ben0x539
Copy link
Contributor Author

ben0x539 commented Apr 4, 2022

Is this a real failure? I don't think I'd have affected rustdoc?

@Dylan-DPC
Copy link
Member

Dylan-DPC commented Apr 4, 2022

@bors r+

@bors
Copy link
Collaborator

bors commented Apr 4, 2022

💡 This pull request was already approved, no need to approve it again.

  • This pull request previously failed. You should add more commits to fix the bug, or use retry to trigger a build again.
  • There's another pull request that is currently being tested, blocking this pull request: Rollup of 6 pull requests #95650

@bors
Copy link
Collaborator

bors commented Apr 4, 2022

📌 Commit 76756cc has been approved by Dylan-DPC

@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 4, 2022
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Apr 5, 2022
@Dylan-DPC
Rollup merge of rust-lang#95234 - ben0x539:nixquotes, r=Dylan-DPC
c5c66a6 
bootstrap.py: nixos check in /etc/os-release with quotes

Per https://www.freedesktop.org/software/systemd/man/os-release.html,

> Variable assignment values must be enclosed in double or single quotes
> if they include spaces, semicolons or other special characters outside
> of A–Z, a–z, 0–9. (Assignments that do not include these special
> characters may be enclosed in quotes too, but this is optional.)

So, past `ID=nixos`, let's also check for `ID='nixos'` and `ID="nixos"`.

One of these is necessary between NixOS/nixpkgs#162168 and
NixOS/nixpkgs#164068, but this seems more correct either way.
@Dylan-DPC Dylan-DPC mentioned this pull request Apr 5, 2022
Closed
@Dylan-DPC Dylan-DPC mentioned this pull request Apr 5, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 5, 2022
@bors
Auto merge of rust-lang#95667 - Dylan-DPC:rollup-n7xzs3y, r=Dylan-DPC
634770c 
Rollup of 5 pull requests

Successful merges:

 - rust-lang#95234 (bootstrap.py: nixos check in /etc/os-release with quotes)
 - rust-lang#95449 (Fix `x doc --stage 0 compiler`)
 - rust-lang#95512 (diagnostics: translation infrastructure)
 - rust-lang#95607 (Note invariance reason for FnDef types)
 - rust-lang#95645 (Fix intra doc link ICE when trying to get traits in scope for primitive)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit b7047c2 into rust-lang:master Apr 5, 2022
@rustbot rustbot added this to the 1.62.0 milestone Apr 5, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 27, 2022
@bors
Auto merge of rust-lang#95170 - jyn514:ci-llvm, r=Mark-Simulacrum
ff18038 
Move `download-ci-llvm` out of bootstrap.py

This is ready for review. It has been tested on Windows, Linux, and NixOS.

The second commit ports the changes from rust-lang#95234 to Rust; I can remove it if desired.

Helps with rust-lang#94829.

As a follow-up, this makes it possible to avoid downloading llvm until it's needed for building `rustc_llvm`; it would be nice to do that, but it shouldn't go in the first draft. It might also be possible to avoid requiring python until tests run (currently there's a check in `sanity.rs`), but I haven't looked too much into that.

`@rustbot` label +A-rustbuild
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels

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

Projects

None yet

Milestone

1.62.0

Development

Successfully merging this pull request may close these issues.

9 participants

@ben0x539 @rust-highfive @rust-log-analyzer @jyn514 @Dylan-DPC @eddyb @bors @Mark-Simulacrum @rustbot