Merge latest main into codex/fix-macos-auth-test-scope
Resolve the macOS race budget conflict in favour of the focused scope.c1f96241on main extended the whole-package macOS race step from 10m to 12m and pinned that budget in the workflow contract. This branch removes the whole-package run instead: ./internal/app is already covered by the Ubuntu "race: app" shard, and macOS only needs the natively-gated tests. With the focused scope the job drops from 10m47s to ~3m, so the 12m budget is no longer needed and the two step timeouts (6m + 5m) fit inside the 15m job budget with headroom. The contract assertionc1f96241added is superseded rather than dropped: pinning both focused commands locks the per-step timeouts, and the existing checks still block a whole-package regression and require ./internal/app to appear exactly once.
This commit is contained in:
commit
20d27f6db9
23 files changed
+6355
-70
No files matched your search
@@ -543,6 +543,11 @@ func TestChangelogPRFastPathWorkflowContract(t *testing.T) {
|
||||
t.Fatal("Code Admission workflow missing macOS test job boundaries")
|
||||
}
|
||||
darwinJob := admission[darwinStart:darwinEnd]
|
||||
// The macOS job no longer runs ./internal/app as a whole package, so it does
|
||||
// not need the package-level race budget the Ubuntu shard gets — the Ubuntu
|
||||
// "race: app" shard already covers everything except the natively-gated
|
||||
// tests. Pinning the two focused commands replaces that budget assertion:
|
||||
// it locks the per-step timeouts and blocks a whole-package regression.
|
||||
for _, want := range []string{
|
||||
`go test -v -race -count=1 -timeout=6m ./internal/keychain ./internal/auth`,
|
||||
`go test -v -race -count=1 -timeout=5m ./internal/app -run '^(TestValidateNewBinary_RecoversFromUnsignedDarwin|Test(CrossPlatformCoverage)?Auth(MigrateKeychain|StatusDiagnosticReportsCiphertextKeyMismatch))'`,
|
||||
|
||||
Reference in new issue
Block a user