Skip to content

Conversation

nikic
Copy link
Contributor

@nikic nikic commented Jul 15, 2025

Instead of making this a build parameter, pass the SCRIPT as an environment variable.

To this purpose, normalize on always referring to a script in /scripts.

For i686-gnu-nopt-2 I had to create a separate script, because Docker seems to be really terrible at command line argument parsing, so it's not possible to pass an environment variable that contains whitespace.

Fixes #143962.

try-job: dist-x86_64-linux
try-job: i686-gnu-nopt-*
try-job: i686-gnu-*
try-job: x86_64-gnu-llvm-19-*
try-job: x86_64-gnu-llvm-20-*

@rustbot
Copy link
Collaborator

rustbot commented Jul 15, 2025

r? @marcoieni

rustbot has assigned @marcoieni.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Jul 15, 2025
@marcoieni
Copy link
Member

@bors2 try

@rust-bors
Copy link

rust-bors bot commented Jul 15, 2025

⌛ Trying commit 63f2956 with merge cd69173

To cancel the try build, run the command @bors2 try cancel.

rust-bors bot added a commit that referenced this pull request Jul 15, 2025
Fix handling of SCRIPT_ARG in docker images

Instead of making this a build parameter, pass the SCRIPT as an environment variable.

To this purpose, normalize on always referring to a script in `/scripts`.

For i686-gnu-nopt-2 I had to create a separate script, because Docker seems to be really terrible at command line argument parsing, so it's not possible to pass an environment variable that contains whitespace.

Fixes #143962.

try-build: aarch64-gnu-llvm-19
try-build: dist-x86_64-linux
try-build: i686-gnu-nopt
try-build: i686-gnu
try-build: x86_64-gnu-llvm-19
try-build: x86_64-gnu-llvm-20
@marcoieni
Copy link
Member

@bors2 try

@rust-bors
Copy link

rust-bors bot commented Jul 15, 2025

⌛ Trying commit 63f2956 with merge 4b3776e

(The previously running try build was automatically cancelled.)

To cancel the try build, run the command @bors2 try cancel.

rust-bors bot added a commit that referenced this pull request Jul 15, 2025
Fix handling of SCRIPT_ARG in docker images

Instead of making this a build parameter, pass the SCRIPT as an environment variable.

To this purpose, normalize on always referring to a script in `/scripts`.

For i686-gnu-nopt-2 I had to create a separate script, because Docker seems to be really terrible at command line argument parsing, so it's not possible to pass an environment variable that contains whitespace.

Fixes #143962.

try-job: aarch64-gnu-llvm-19
try-job: dist-x86_64-linux
try-job: i686-gnu-nopt
try-job: i686-gnu
try-job: x86_64-gnu-llvm-19
try-job: x86_64-gnu-llvm-20
@rust-bors
Copy link

rust-bors bot commented Jul 15, 2025

💔 Test failed

@marcoieni
Copy link
Member

@bors2 try

@rust-bors
Copy link

rust-bors bot commented Jul 15, 2025

⌛ Trying commit 63f2956 with merge 74e8712

To cancel the try build, run the command @bors2 try cancel.

rust-bors bot added a commit that referenced this pull request Jul 15, 2025
Fix handling of SCRIPT_ARG in docker images

Instead of making this a build parameter, pass the SCRIPT as an environment variable.

To this purpose, normalize on always referring to a script in `/scripts`.

For i686-gnu-nopt-2 I had to create a separate script, because Docker seems to be really terrible at command line argument parsing, so it's not possible to pass an environment variable that contains whitespace.

Fixes #143962.

try-job: aarch64-gnu-llvm-19-1
try-job: dist-x86_64-linux
try-job: i686-gnu-nopt-1
try-job: i686-gnu-1
try-job: x86_64-gnu-llvm-19-1
try-job: x86_64-gnu-llvm-20-2
@rust-bors
Copy link

rust-bors bot commented Jul 15, 2025

💔 Test failed

@marcoieni
Copy link
Member

@bors2 try

Just took me 4 attempts to list all the jobs 😂

rust-bors bot added a commit that referenced this pull request Jul 15, 2025
Fix handling of SCRIPT_ARG in docker images

Instead of making this a build parameter, pass the SCRIPT as an environment variable.

To this purpose, normalize on always referring to a script in `/scripts`.

For i686-gnu-nopt-2 I had to create a separate script, because Docker seems to be really terrible at command line argument parsing, so it's not possible to pass an environment variable that contains whitespace.

Fixes #143962.

try-job: dist-x86_64-linux
try-job: i686-gnu-nopt-1
try-job: i686-gnu-1
try-job: x86_64-gnu-llvm-19-1
try-job: x86_64-gnu-llvm-20-2
@rust-bors
Copy link

rust-bors bot commented Jul 15, 2025

⌛ Trying commit 63f2956 with merge 95c54ad

To cancel the try build, run the command @bors2 try cancel.

@marcoieni
Copy link
Member

This looks like a good cleanup, thanks!

I will approve once CI is green

@rust-bors
Copy link

rust-bors bot commented Jul 15, 2025

💔 Test failed

Instead of making this a build parameter, pass the SCRIPT as an
environment variable.

To this purpose, normalize on always referring to a script in
`/scripts`.

For i686-gnu-nopt-2 I had to create a separate script, because
Docker seems to be really terrible at command line argument
parsing, so it's not possible to pass an environment variable that
contains whitespace.
@nikic nikic force-pushed the docker-script-arg branch from 63f2956 to 4b421d4 Compare July 15, 2025 14:23
@nikic
Copy link
Contributor Author

nikic commented Jul 15, 2025

@bors2 try

Adjusted path of stage_2_test_set1.sh in x86_64-gnu-llvm2.sh.

rust-bors bot added a commit that referenced this pull request Jul 15, 2025
Fix handling of SCRIPT_ARG in docker images

Instead of making this a build parameter, pass the SCRIPT as an environment variable.

To this purpose, normalize on always referring to a script in `/scripts`.

For i686-gnu-nopt-2 I had to create a separate script, because Docker seems to be really terrible at command line argument parsing, so it's not possible to pass an environment variable that contains whitespace.

Fixes #143962.

try-job: dist-x86_64-linux
try-job: i686-gnu-nopt-1
try-job: i686-gnu-1
try-job: x86_64-gnu-llvm-19-1
try-job: x86_64-gnu-llvm-20-2
@rust-bors
Copy link

rust-bors bot commented Jul 15, 2025

⌛ Trying commit 4b421d4 with merge 4ba49dc

To cancel the try build, run the command @bors2 try cancel.

@marcoieni
Copy link
Member

@bors2 try

I used the * pattern to test all affected jobs

@rust-bors
Copy link

rust-bors bot commented Jul 15, 2025

⌛ Trying commit 4b421d4 with merge 7f46195

(The previously running try build was automatically cancelled.)

To cancel the try build, run the command @bors2 try cancel.

rust-bors bot added a commit that referenced this pull request Jul 15, 2025
Fix handling of SCRIPT_ARG in docker images

Instead of making this a build parameter, pass the SCRIPT as an environment variable.

To this purpose, normalize on always referring to a script in `/scripts`.

For i686-gnu-nopt-2 I had to create a separate script, because Docker seems to be really terrible at command line argument parsing, so it's not possible to pass an environment variable that contains whitespace.

Fixes #143962.

try-job: `dist-x86_64-linux`
try-job: `i686-gnu-nopt-*`
try-job: `i686-gnu-*`
try-job: `x86_64-gnu-llvm-19-*`
try-job: `x86_64-gnu-llvm-20-*`
@Kobzol
Copy link
Member

Kobzol commented Jul 15, 2025

Hmm, I wish I remembered why we used a build argument. I guess it just didn't occur to us that an environment variable during runtime is also a possibility. This could even improve the caching of the images being built. Thanks for catching this!

@rust-bors
Copy link

rust-bors bot commented Jul 15, 2025

☀️ Try build successful (CI)
Build commit: 7f46195 (7f461954b1d806ade8a155ee509b3d81f40a1f43, parent: e27f16a499074ba9a87f7f7641d9f64c572863bc)

@marcoieni
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Jul 16, 2025

📌 Commit 4b421d4 has been approved by marcoieni

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 Jul 16, 2025
fmease added a commit to fmease/rust that referenced this pull request Jul 16, 2025
Fix handling of SCRIPT_ARG in docker images

Instead of making this a build parameter, pass the SCRIPT as an environment variable.

To this purpose, normalize on always referring to a script in `/scripts`.

For i686-gnu-nopt-2 I had to create a separate script, because Docker seems to be really terrible at command line argument parsing, so it's not possible to pass an environment variable that contains whitespace.

Fixes rust-lang#143962.

try-job: `dist-x86_64-linux`
try-job: `i686-gnu-nopt-*`
try-job: `i686-gnu-*`
try-job: `x86_64-gnu-llvm-19-*`
try-job: `x86_64-gnu-llvm-20-*`
bors added a commit that referenced this pull request Jul 17, 2025
Rollup of 15 pull requests

Successful merges:

 - #142304 (tests: Add `RUST_BACKTRACE` and `-Cpanic` revisions to `panic-main.rs` test)
 - #143388 (Various refactors to the LTO handling code)
 - #143409 (Enable xgot feature for mips64 musl targets)
 - #143592 (UWP: link ntdll functions using raw-dylib)
 - #143595 (add `const_make_global`; err for `const_allocate` ptrs if didn't call)
 - #143678 (Added error for invalid char cast)
 - #143820 (Fixed a core crate compilation failure when enabling the `optimize_for_size` feature on some targets)
 - #143829 (Trim `BorrowedCursor` API)
 - #143846 (pass --gc-sections if -Zexport-executable-symbols is enabled and improve tests)
 - #143851 (ci cleanup: rustdoc-gui-test now installs browser-ui-test)
 - #143856 (Linting public reexport of private dependencies)
 - #143895 (Dont collect assoc ty item bounds from trait where clause for host effect predicates)
 - #143922 (Improve path segment joining)
 - #143964 (Fix handling of SCRIPT_ARG in docker images)
 - #144016 (trait_sel: `MetaSized` always holds temporarily)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit that referenced this pull request Jul 17, 2025
Rollup of 15 pull requests

Successful merges:

 - #142304 (tests: Add `RUST_BACKTRACE` and `-Cpanic` revisions to `panic-main.rs` test)
 - #143388 (Various refactors to the LTO handling code)
 - #143409 (Enable xgot feature for mips64 musl targets)
 - #143592 (UWP: link ntdll functions using raw-dylib)
 - #143595 (add `const_make_global`; err for `const_allocate` ptrs if didn't call)
 - #143678 (Added error for invalid char cast)
 - #143820 (Fixed a core crate compilation failure when enabling the `optimize_for_size` feature on some targets)
 - #143829 (Trim `BorrowedCursor` API)
 - #143851 (ci cleanup: rustdoc-gui-test now installs browser-ui-test)
 - #143856 (Linting public reexport of private dependencies)
 - #143895 (Dont collect assoc ty item bounds from trait where clause for host effect predicates)
 - #143922 (Improve path segment joining)
 - #143964 (Fix handling of SCRIPT_ARG in docker images)
 - #144002 (Update poison.rs)
 - #144016 (trait_sel: `MetaSized` always holds temporarily)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 6dfec1a into rust-lang:master Jul 17, 2025
12 checks passed
@rustbot rustbot added this to the 1.90.0 milestone Jul 17, 2025
rust-timer added a commit that referenced this pull request Jul 17, 2025
Rollup merge of #143964 - nikic:docker-script-arg, r=marcoieni

Fix handling of SCRIPT_ARG in docker images

Instead of making this a build parameter, pass the SCRIPT as an environment variable.

To this purpose, normalize on always referring to a script in `/scripts`.

For i686-gnu-nopt-2 I had to create a separate script, because Docker seems to be really terrible at command line argument parsing, so it's not possible to pass an environment variable that contains whitespace.

Fixes #143962.

try-job: `dist-x86_64-linux`
try-job: `i686-gnu-nopt-*`
try-job: `i686-gnu-*`
try-job: `x86_64-gnu-llvm-19-*`
try-job: `x86_64-gnu-llvm-20-*`
Muscraft pushed a commit to Muscraft/rust that referenced this pull request Jul 21, 2025
Fix handling of SCRIPT_ARG in docker images

Instead of making this a build parameter, pass the SCRIPT as an environment variable.

To this purpose, normalize on always referring to a script in `/scripts`.

For i686-gnu-nopt-2 I had to create a separate script, because Docker seems to be really terrible at command line argument parsing, so it's not possible to pass an environment variable that contains whitespace.

Fixes rust-lang#143962.

try-job: `dist-x86_64-linux`
try-job: `i686-gnu-nopt-*`
try-job: `i686-gnu-*`
try-job: `x86_64-gnu-llvm-19-*`
try-job: `x86_64-gnu-llvm-20-*`
Muscraft pushed a commit to Muscraft/rust that referenced this pull request Jul 21, 2025
Rollup of 15 pull requests

Successful merges:

 - rust-lang#142304 (tests: Add `RUST_BACKTRACE` and `-Cpanic` revisions to `panic-main.rs` test)
 - rust-lang#143388 (Various refactors to the LTO handling code)
 - rust-lang#143409 (Enable xgot feature for mips64 musl targets)
 - rust-lang#143592 (UWP: link ntdll functions using raw-dylib)
 - rust-lang#143595 (add `const_make_global`; err for `const_allocate` ptrs if didn't call)
 - rust-lang#143678 (Added error for invalid char cast)
 - rust-lang#143820 (Fixed a core crate compilation failure when enabling the `optimize_for_size` feature on some targets)
 - rust-lang#143829 (Trim `BorrowedCursor` API)
 - rust-lang#143851 (ci cleanup: rustdoc-gui-test now installs browser-ui-test)
 - rust-lang#143856 (Linting public reexport of private dependencies)
 - rust-lang#143895 (Dont collect assoc ty item bounds from trait where clause for host effect predicates)
 - rust-lang#143922 (Improve path segment joining)
 - rust-lang#143964 (Fix handling of SCRIPT_ARG in docker images)
 - rust-lang#144002 (Update poison.rs)
 - rust-lang#144016 (trait_sel: `MetaSized` always holds temporarily)

r? `@ghost`
`@rustbot` modify labels: rollup
rust-cloud-vms bot pushed a commit to makai410/rustc_public that referenced this pull request Aug 16, 2025
Rollup of 15 pull requests

Successful merges:

 - rust-lang/rust#142304 (tests: Add `RUST_BACKTRACE` and `-Cpanic` revisions to `panic-main.rs` test)
 - rust-lang/rust#143388 (Various refactors to the LTO handling code)
 - rust-lang/rust#143409 (Enable xgot feature for mips64 musl targets)
 - rust-lang/rust#143592 (UWP: link ntdll functions using raw-dylib)
 - rust-lang/rust#143595 (add `const_make_global`; err for `const_allocate` ptrs if didn't call)
 - rust-lang/rust#143678 (Added error for invalid char cast)
 - rust-lang/rust#143820 (Fixed a core crate compilation failure when enabling the `optimize_for_size` feature on some targets)
 - rust-lang/rust#143829 (Trim `BorrowedCursor` API)
 - rust-lang/rust#143851 (ci cleanup: rustdoc-gui-test now installs browser-ui-test)
 - rust-lang/rust#143856 (Linting public reexport of private dependencies)
 - rust-lang/rust#143895 (Dont collect assoc ty item bounds from trait where clause for host effect predicates)
 - rust-lang/rust#143922 (Improve path segment joining)
 - rust-lang/rust#143964 (Fix handling of SCRIPT_ARG in docker images)
 - rust-lang/rust#144002 (Update poison.rs)
 - rust-lang/rust#144016 (trait_sel: `MetaSized` always holds temporarily)

r? `@ghost`
`@rustbot` modify labels: rollup
rust-cloud-vms bot pushed a commit to makai410/rustc_public that referenced this pull request Aug 20, 2025
Rollup of 15 pull requests

Successful merges:

 - rust-lang/rust#142304 (tests: Add `RUST_BACKTRACE` and `-Cpanic` revisions to `panic-main.rs` test)
 - rust-lang/rust#143388 (Various refactors to the LTO handling code)
 - rust-lang/rust#143409 (Enable xgot feature for mips64 musl targets)
 - rust-lang/rust#143592 (UWP: link ntdll functions using raw-dylib)
 - rust-lang/rust#143595 (add `const_make_global`; err for `const_allocate` ptrs if didn't call)
 - rust-lang/rust#143678 (Added error for invalid char cast)
 - rust-lang/rust#143820 (Fixed a core crate compilation failure when enabling the `optimize_for_size` feature on some targets)
 - rust-lang/rust#143829 (Trim `BorrowedCursor` API)
 - rust-lang/rust#143851 (ci cleanup: rustdoc-gui-test now installs browser-ui-test)
 - rust-lang/rust#143856 (Linting public reexport of private dependencies)
 - rust-lang/rust#143895 (Dont collect assoc ty item bounds from trait where clause for host effect predicates)
 - rust-lang/rust#143922 (Improve path segment joining)
 - rust-lang/rust#143964 (Fix handling of SCRIPT_ARG in docker images)
 - rust-lang/rust#144002 (Update poison.rs)
 - rust-lang/rust#144016 (trait_sel: `MetaSized` always holds temporarily)

r? `@ghost`
`@rustbot` modify labels: rollup
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-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.

Incorrect SCRIPT_ARG handling for docker images
5 participants