Skip to content

Commit ad75760

Browse files
committed
CI: Redirect stderr to stdout to order GHA logs
1 parent e2cf2cb commit ad75760

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
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)] }}"

src/ci/github-actions/ci.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,8 @@ x--expand-yaml-anchors--remove:
249249
<<: *step
250250

251251
- name: run the build
252-
run: src/ci/scripts/run-build-from-ci.sh
252+
# Redirect stderr to stdout to avoid reordering the two streams in the GHA logs.
253+
run: src/ci/scripts/run-build-from-ci.sh 2>&1
253254
env:
254255
AWS_ACCESS_KEY_ID: ${{ env.CACHES_AWS_ACCESS_KEY_ID }}
255256
AWS_SECRET_ACCESS_KEY: ${{ secrets[format('AWS_SECRET_ACCESS_KEY_{0}', env.CACHES_AWS_ACCESS_KEY_ID)] }}

0 commit comments

Comments
 (0)