diff options
| author | bors <bors@rust-lang.org> | 2024-02-18 02:00:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-02-18 02:00:23 +0000 |
| commit | 1f8e824f111c972c9df8dbb378d87c33f67bbad4 (patch) | |
| tree | ebb22c7b12b0ceaa01b5f1b5fe6648c3ba47e79e | |
| parent | 158f00a1c5175648af6f6099b075f78d1d014a28 (diff) | |
| parent | bc2355a34d28c44222b5f6e444b1742c45b43738 (diff) | |
Auto merge of #121214 - weihanglo:update-cargo, r=weihanglo
Update cargo 12 commits in fc1d58fd0531a57a6b942a14cdcdbcb82ece16f3..7b7af3077bff8d60b7f124189bc9de227d3063a9 2024-02-09 15:54:29 +0000 to 2024-02-17 14:13:00 +0000 - Remove unnecessary `use` statement in metabuild (rust-lang/cargo#13455) - chore: Update snapbox (rust-lang/cargo#13441) - chore(deps): update openssl to 3.2.1 again (rust-lang/cargo#13449) - fix(test): Suggest `--` for libtest arguments (rust-lang/cargo#13448) - chore(ci): Drop MSRV:1 patch field (rust-lang/cargo#13442) - fix(add): Remove inconsistent period (rust-lang/cargo#13446) - fix(add): Ensure users know a feature is being created (rust-lang/cargo#13434) - Update tests for changes in latest nightly (rust-lang/cargo#13444) - docs: Minor clarification of build script metadata. (rust-lang/cargo#13436) - Fix old_cargos tests (rust-lang/cargo#13435) - Fix confusing error messages for sparse index replaced source (rust-lang/cargo#13433) - Enable edition migration for 2024 (rust-lang/cargo#13429)
| -rw-r--r-- | src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile | 1 | ||||
| -rw-r--r-- | src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile | 1 | ||||
| m--------- | src/tools/cargo | 0 |
3 files changed, 2 insertions, 0 deletions
diff --git a/src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile b/src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile index f5274104d60..1704bef1e4e 100644 --- a/src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile +++ b/src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile @@ -25,6 +25,7 @@ RUN yum upgrade -y && \ openssl-devel \ patch \ perl \ + perl-core \ pkgconfig \ python3 \ unzip \ diff --git a/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile b/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile index 9a2fcb0ce0a..fe84c23a11c 100644 --- a/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile +++ b/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile @@ -25,6 +25,7 @@ RUN yum upgrade -y && \ openssl-devel \ patch \ perl \ + perl-core \ pkgconfig \ python3 \ unzip \ diff --git a/src/tools/cargo b/src/tools/cargo -Subproject fc1d58fd0531a57a6b942a14cdcdbcb82ece16f +Subproject 7b7af3077bff8d60b7f124189bc9de227d3063a |