Skip to content

Commit

Permalink
Auto merge of #121214 - weihanglo:update-cargo, r=<try>
Browse files Browse the repository at this point in the history
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
  • Loading branch information
bors committed Feb 17, 2024
2 parents ba824a2 + c0a11cc commit e669f9e
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 1 deletion.
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -589,6 +589,9 @@ jobs:
env:
CODEGEN_BACKENDS: "llvm,cranelift"
os: ubuntu-20.04-16core-64gb
- name: dist-i686-linux
os: ubuntu-20.04-8core-32gb
env: {}
timeout-minutes: 600
runs-on: "${{ matrix.os }}"
steps:
Expand Down
1 change: 1 addition & 0 deletions src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ RUN yum upgrade -y && \
openssl-devel \
patch \
perl \
perl-core \
pkgconfig \
python3 \
unzip \
Expand Down
1 change: 1 addition & 0 deletions src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ RUN yum upgrade -y && \
openssl-devel \
patch \
perl \
perl-core \
pkgconfig \
python3 \
unzip \
Expand Down
2 changes: 2 additions & 0 deletions src/ci/github-actions/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -739,6 +739,8 @@ jobs:
env:
CODEGEN_BACKENDS: llvm,cranelift
<<: *job-linux-16c
- name: dist-i686-linux
<<: *job-linux-8c


master:
Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 379 files

0 comments on commit e669f9e

Please sign in to comment.