Fix podman detection in CI scripts #116761

Noratrieb · 2023-10-15T10:54:39Z

When docker-podman compat was set up in a way that causes "docker" to be the argv[0] of podman, the previous detection did not work. This was for example the case in the compat package from nixpkgs.

This checks the output and should work everywhere.

I tested it locally by executing

if [[ "$id" != 0 && "$(docker version)" =~ Podman ]]; then
    echo yes
else
    echo no
fi

which printed no before, and yes now.

fixes #113129

r? cuviper

When docker-podman compat was set up in a way that causes "docker" to be the argv[0] of podman, the previous detection did not work. This was for example the case in the compat package from nixpkgs. This checks the output and should work everywhere.

cuviper · 2023-10-18T23:02:43Z

Thanks!

@bors r+ rollup

bors · 2023-10-18T23:02:46Z

📌 Commit 6ab84b5 has been approved by cuviper

It is now in the queue for this repository.

Rollup of 7 pull requests Successful merges: - rust-lang#116663 (Don't ICE when encountering unresolved regions in `fully_resolve`) - rust-lang#116761 (Fix podman detection in CI scripts) - rust-lang#116795 (Add `#[track_caller]` to `Option::unwrap_or_else`) - rust-lang#116829 (Make `#[repr(Rust)]` incompatible with other (non-modifier) representation hints like `C` and `simd`) - rust-lang#116883 (Change my name in mailmap) - rust-lang#116908 (Tweak wording of type errors involving type params) - rust-lang#116912 (Some renaming nits for `rustc_type_ir`) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#116761 - Nilstrieb:podman, r=cuviper Fix podman detection in CI scripts When docker-podman compat was set up in a way that causes "docker" to be the argv[0] of podman, the previous detection did not work. This was for example the case in the compat package from nixpkgs. This checks the output and should work everywhere. I tested it locally by executing ```sh if [[ "$id" != 0 && "$(docker version)" =~ Podman ]]; then echo yes else echo no fi ``` which printed `no` before, and `yes` now. fixes rust-lang#113129 r? cuviper

rustbot assigned cuviper Oct 15, 2023

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 Oct 15, 2023

Fix podman detection in CI scripts

6ab84b5

When docker-podman compat was set up in a way that causes "docker" to be the argv[0] of podman, the previous detection did not work. This was for example the case in the compat package from nixpkgs. This checks the output and should work everywhere.

Noratrieb marked this pull request as ready for review October 15, 2023 11:28

Noratrieb force-pushed the podman branch from 4c886b6 to 6ab84b5 Compare October 15, 2023 11:28

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 Oct 18, 2023

fmease mentioned this pull request Oct 19, 2023

Rollup of 7 pull requests #116923

Merged

bors merged commit 29d9877 into rust-lang:master Oct 19, 2023
11 checks passed

rustbot added this to the 1.75.0 milestone Oct 19, 2023

Noratrieb deleted the podman branch October 19, 2023 05:51

github-actions bot mentioned this pull request Oct 31, 2023

Automated pull from upstream master ferrocene/ferrocene#74

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix podman detection in CI scripts #116761

Fix podman detection in CI scripts #116761

Noratrieb commented Oct 15, 2023 •

edited

Loading

cuviper commented Oct 18, 2023

bors commented Oct 18, 2023

Fix podman detection in CI scripts #116761

Fix podman detection in CI scripts #116761

Conversation

Noratrieb commented Oct 15, 2023 • edited Loading

cuviper commented Oct 18, 2023

bors commented Oct 18, 2023

Noratrieb commented Oct 15, 2023 •

edited

Loading