Skip to content

Commit d7de095

Browse files
committed
Auto merge of rust-lang#123542 - matthiaskrgr:rollup-grvn769, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - rust-lang#114788 (impl get_mut_or_init and get_mut_or_try_init for OnceCell and OnceLock) - rust-lang#122291 (Stabilize `const_caller_location` and `const_location_fields`) - rust-lang#123321 (Bump dependencies) - rust-lang#123339 (optimize tidy check on `src/tools/tidy/src/issues.txt`) - rust-lang#123357 (CI: Redirect stderr to stdout to order GHA logs) - rust-lang#123504 (bootstrap: split cargo-miri test into separate Step) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 3f10032 + 168f210 commit d7de095

File tree

17 files changed

+4683
-4498
lines changed

17 files changed

+4683
-4498
lines changed

.github/workflows/ci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ jobs:
156156
run: src/ci/scripts/verify-stable-version-number.sh
157157
if: success() && !env.SKIP_JOB
158158
- name: run the build
159-
run: src/ci/scripts/run-build-from-ci.sh
159+
run: src/ci/scripts/run-build-from-ci.sh 2>&1
160160
env:
161161
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
162162
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
@@ -566,7 +566,7 @@ jobs:
566566
run: src/ci/scripts/verify-stable-version-number.sh
567567
if: success() && !env.SKIP_JOB
568568
- name: run the build
569-
run: src/ci/scripts/run-build-from-ci.sh
569+
run: src/ci/scripts/run-build-from-ci.sh 2>&1
570570
env:
571571
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
572572
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
@@ -705,7 +705,7 @@ jobs:
705705
run: src/ci/scripts/verify-stable-version-number.sh
706706
if: success() && !env.SKIP_JOB
707707
- name: run the build
708-
run: src/ci/scripts/run-build-from-ci.sh
708+
run: src/ci/scripts/run-build-from-ci.sh 2>&1
709709
env:
710710
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
711711
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"

0 commit comments

Comments
 (0)