diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-04-06 13:00:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-06 13:00:05 +0200 |
| commit | 459dd38611e9373ab43e5401fcb43ed98e2a9b83 (patch) | |
| tree | 3ea00f76d134aa0a13200467a25a0d5c8041604a | |
| parent | cb7f1eec043141db54acc1bc406d0e1c32938e26 (diff) | |
| parent | ad75760637ac3e4bd400346bb847707010c0093f (diff) | |
| download | rust-459dd38611e9373ab43e5401fcb43ed98e2a9b83.tar.gz rust-459dd38611e9373ab43e5401fcb43ed98e2a9b83.zip | |
Rollup merge of #123357 - Kobzol:ci-combine-streams, r=Mark-Simulacrum
CI: Redirect stderr to stdout to order GHA logs This PR modifies the main CI workflow so that its stderr is redirected to stdout. This should make it so that stderr and stdout output is not interleaved in the wrong order in GHA logs (see discussion [here](https://rust-lang.zulipchat.com/#narrow/stream/242791-t-infra/topic/Github.20actions.20logs.20show.20lines.20in.20the.20wrong.20order)).
| -rw-r--r-- | .github/workflows/ci.yml | 6 | ||||
| -rw-r--r-- | src/ci/github-actions/ci.yml | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f1c87b0a76e..16b0512a88a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -156,7 +156,7 @@ jobs: run: src/ci/scripts/verify-stable-version-number.sh if: success() && !env.SKIP_JOB - 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: 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)] }}" @@ -566,7 +566,7 @@ jobs: run: src/ci/scripts/verify-stable-version-number.sh if: success() && !env.SKIP_JOB - 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: 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)] }}" @@ -705,7 +705,7 @@ jobs: run: src/ci/scripts/verify-stable-version-number.sh if: success() && !env.SKIP_JOB - 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: 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)] }}" diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index 80e23574404..9323bb093ad 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -249,7 +249,8 @@ x--expand-yaml-anchors--remove: <<: *step - 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: 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)] }} |