mirror of
https://github.com/openai/codex.git
synced 2026-11-17 22:10:37 +00:00
Merge main to restore PR CI
GitHub stopped enqueuing pull_request workflows once the PR head became merge-conflicted against main. Merge main into the branch, preserve the flaky-test fixes, and record the CI trigger issue in the triage ledger. Co-authored-by: Codex <noreply@openai.com>
This commit is contained in:
@@ -66,6 +66,7 @@ Older failures also appeared on Linux, but the repeated cross-PR signal is stron
|
||||
- Include buffered-notification method names in timeout failures so any future ordering bugs surface directly in CI annotations.
|
||||
- Cap the Windows PowerShell AST parser subprocess at `5s` and kill it on timeout so a hung `pwsh` startup fails closed instead of stalling `exec_policy::tests::verify_approval_requirement_for_unsafe_powershell_command` until nextest aborts the shard.
|
||||
- Add a Windows-only regression test that launches a deliberately sleeping fake PowerShell executable and asserts the parser returns `Failed` within the same `5s` cap.
|
||||
- Merge `origin/main` into the PR branch to clear a newly dirty merge state after GitHub stopped enqueuing any `pull_request` workflows for two consecutive heads and created only the `CLA Assistant` suite.
|
||||
- Rationale: these failures are test-harness flakes, not product behaviors. The fixes keep the assertions intact and remove environment-sensitive startup and ordering hazards instead of stretching timeouts.
|
||||
|
||||
## Constraints
|
||||
@@ -103,3 +104,4 @@ Older failures also appeared on Linux, but the repeated cross-PR signal is stron
|
||||
| `cc4785e3f` | Buffer fuzzy search session notifications | full pass | Runs `23085926272` (`rust-ci`) and `23085926275` (`Bazel (experimental)`) finished green for the full PR after rerunning the two failed Bazel Linux shards on the same SHA. The fuzzy-search harness now buffers unmatched notifications, so out-of-order `sessionCompleted` events no longer disappear before the completion wait starts. This is pass 1 of 5 after the latest failing run. |
|
||||
| `5399ca70d` | Record validation pass 1 | failed | Run `23086309217` failed only in `Tests — windows-x64 - x86_64-pc-windows-msvc`. Nextest timed out in `codex-core exec_policy::tests::verify_approval_requirement_for_unsafe_powershell_command` after `30.015s`, while the rest of the matrix and all Bazel shards passed on the same SHA. The follow-up bounds the PowerShell AST parser subprocess to `5s` so stalled startup no longer hangs the shard. |
|
||||
| `83e7ab58a` | Bound Windows PowerShell parser hangs | no PR CI | GitHub created only the `CLA Assistant` check suite for this SHA and never enqueued any `pull_request` workflows after repeated Actions API polls by `head_sha`. The next commit retriggers the PR synchronize event without changing the flaky-test fix. |
|
||||
| `9f21509ab` | Retrigger PR CI after dropped event | no PR CI | GitHub again created only the `CLA Assistant` suite for this SHA. The PR simultaneously flipped to `mergeable: false`, `rebaseable: false`, `mergeable_state: dirty`, so the next follow-up merges `origin/main` into the branch to clear the conflict and restore a clean PR head before retrying the full CI loop. |
|
||||
|
||||
Reference in New Issue
Block a user