Skip to content

Commit 294fead

Browse files
committed
ci: fix sync-upstream.sh, again again
1 parent f95d5cd commit 294fead

2 files changed

Lines changed: 22 additions & 3 deletions

File tree

.github/workflows/sync-upstream.sh

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,19 @@ verify() {
119119
done
120120
if [[ "${NO_TEST:-0}" == "1" ]]; then
121121
echo " go test skipped (NO_TEST=1)"
122-
else
123-
go test ./... >/dev/null || die "go test failed in the root module"
122+
return 0
123+
fi
124+
125+
# Quiet while passing, but print everything on failure. Swallowing this
126+
# output leaves a red CI run with no way to tell what broke.
127+
local out
128+
out="$(mktemp)"
129+
if go test ./... >"$out" 2>&1; then
124130
echo " go test OK ."
131+
else
132+
warn "go test failed in the root module:"
133+
grep -vE '^(ok|\?)' "$out" || true
134+
die "go test failed in the root module"
125135
fi
126136
}
127137

.github/workflows/sync-upstream.yaml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,13 @@ jobs:
3838
# future upstream bump past `stable` fetches what go.mod asks for
3939
# rather than failing.
4040
GOTOOLCHAIN: auto
41+
# Build here, but leave testing to ci.yaml, which runs on the PR this
42+
# job opens and does it better (`-race -count=1`). Testing in both
43+
# places means a single flaky test aborts the job before the PR
44+
# exists, so nobody can see what failed or decide what to do about
45+
# it. A red check on an open PR is the better outcome: the human who
46+
# has to approve it sees the failure and judges it.
47+
NO_TEST: "1"
4148
run: .github/workflows/sync-upstream.sh
4249

4350
- name: Record upstream revision
@@ -62,7 +69,9 @@ jobs:
6269
1. Reverted the `authzed` import rename
6370
2. Merged `upstream/master`
6471
3. Re-applied the rename
65-
4. Verified `go build` in every Go module and `go test ./...` in the root
72+
4. Verified `go build` in every Go module
73+
74+
Tests are not run by the sync job; CI runs them on this PR.
6675
6776
The result is upstream plus the import-path rename and nothing else.
6877

0 commit comments

Comments
 (0)