Skip to content

Commit e669f9e

Browse files
committed
Auto merge of rust-lang#121214 - weihanglo:update-cargo, r=<try>
Update cargo 11 commits in fc1d58fd0531a57a6b942a14cdcdbcb82ece16f3..9090349adc88e0fcae2644c2cceb830124a10d5d 2024-02-09 15:54:29 +0000 to 2024-02-16 16:56:57 +0000 - 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) r? ghost
2 parents ba824a2 + c0a11cc commit e669f9e

File tree

5 files changed

+8
-1
lines changed

5 files changed

+8
-1
lines changed

.github/workflows/ci.yml

+3
Original file line numberDiff line numberDiff line change
@@ -589,6 +589,9 @@ jobs:
589589
env:
590590
CODEGEN_BACKENDS: "llvm,cranelift"
591591
os: ubuntu-20.04-16core-64gb
592+
- name: dist-i686-linux
593+
os: ubuntu-20.04-8core-32gb
594+
env: {}
592595
timeout-minutes: 600
593596
runs-on: "${{ matrix.os }}"
594597
steps:

src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ RUN yum upgrade -y && \
2525
openssl-devel \
2626
patch \
2727
perl \
28+
perl-core \
2829
pkgconfig \
2930
python3 \
3031
unzip \

src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ RUN yum upgrade -y && \
2525
openssl-devel \
2626
patch \
2727
perl \
28+
perl-core \
2829
pkgconfig \
2930
python3 \
3031
unzip \

src/ci/github-actions/ci.yml

+2
Original file line numberDiff line numberDiff line change
@@ -739,6 +739,8 @@ jobs:
739739
env:
740740
CODEGEN_BACKENDS: llvm,cranelift
741741
<<: *job-linux-16c
742+
- name: dist-i686-linux
743+
<<: *job-linux-8c
742744

743745

744746
master:

src/tools/cargo

Submodule cargo updated 379 files

0 commit comments

Comments
 (0)