dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CI: Redirect stderr to stdout to order GHA logs

This commit is contained in:
Jakub Beránek 2024-04-02 11:34:53 +02:00
parent e2cf2cb303
commit ad75760637
No known key found for this signature in database
GPG Key ID: 909CD0D26483516B
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/ci.yml vendored
View File

@ -156,7 +156,7 @@ jobs:
run: src/ci/scripts/verify-stable-version-number.sh run: src/ci/scripts/verify-stable-version-number.sh
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: run the build - name: run the build
run: src/ci/scripts/run-build-from-ci.sh run: src/ci/scripts/run-build-from-ci.sh 2>&1
env: env:
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}" AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}" AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
@ -566,7 +566,7 @@ jobs:
run: src/ci/scripts/verify-stable-version-number.sh run: src/ci/scripts/verify-stable-version-number.sh
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: run the build - name: run the build
run: src/ci/scripts/run-build-from-ci.sh run: src/ci/scripts/run-build-from-ci.sh 2>&1
env: env:
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}" AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}" AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"
@ -705,7 +705,7 @@ jobs:
run: src/ci/scripts/verify-stable-version-number.sh run: src/ci/scripts/verify-stable-version-number.sh
if: success() && !env.SKIP_JOB if: success() && !env.SKIP_JOB
- name: run the build - name: run the build
run: src/ci/scripts/run-build-from-ci.sh run: src/ci/scripts/run-build-from-ci.sh 2>&1
env: env:
AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}" AWS_ACCESS_KEY_ID: "${{ env.CACHES_AWS_ACCESS_KEY_ID }}"
AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}" AWS_SECRET_ACCESS_KEY: "${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}"

3
src/ci/github-actions/ci.yml
View File

@ -249,7 +249,8 @@ x--expand-yaml-anchors--remove:
<<: *step <<: *step
- name: run the build - name: run the build
run: src/ci/scripts/run-build-from-ci.sh # Redirect stderr to stdout to avoid reordering the two streams in the GHA logs.
run: src/ci/scripts/run-build-from-ci.sh 2>&1
env: env:
AWS_ACCESS_KEY_ID: ${{ env.CACHES_AWS_ACCESS_KEY_ID }} AWS_ACCESS_KEY_ID: ${{ env.CACHES_AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }} AWS_SECRET_ACCESS_KEY: ${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}