From 77f9fe5393a89bb1ada228e9ed80f7932855bc5d Mon Sep 17 00:00:00 2001 From: Neil <4138956+nwparker@users.noreply.github.com> Date: Thu, 20 Aug 2026 02:07:56 -0700 Subject: [PATCH] ci(pty): keep the fish real-PTY test in the shell-contracts lane only Reverting pr.yml to main dropped the exclusion for the fish query-reply test, which this branch keeps, so it would have run in the sharded lane as well. Restores it to the shell-contracts include list and the shard exclude list, and drops the parallelism expectations for the deleted cooked-querier suite and the echo-state env guard. --- .github/workflows/pr.yml | 2 ++ config/scripts/pr-workflow-parallelism.test.mjs | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 48b545ef3ea..3e9d279e5c3 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -413,6 +413,7 @@ jobs: src/main/zsh-startup-hook-user-config-equivalence.live-shell.test.ts \ src/main/zsh-wrapper-version-mismatch.live-shell.test.ts \ src/renderer/src/components/terminal-pane/fish-color-scheme-child-stdin.node-pty.test.ts \ + src/shared/fish-query-reply-child-stdin.node-pty.test.ts \ src/shared/startup-shell-portability.live-shell.test.ts \ src/shared/posix-command-path-lookup.test.ts @@ -457,6 +458,7 @@ jobs: --exclude=src/main/zsh-startup-hook-user-config-equivalence.live-shell.test.ts \ --exclude=src/main/zsh-wrapper-version-mismatch.live-shell.test.ts \ --exclude=src/renderer/src/components/terminal-pane/fish-color-scheme-child-stdin.node-pty.test.ts \ + --exclude=src/shared/fish-query-reply-child-stdin.node-pty.test.ts \ --exclude=src/shared/startup-shell-portability.live-shell.test.ts \ --exclude=src/shared/posix-command-path-lookup.test.ts \ --exclude=tests/e2e/cross-version-wire/** \ diff --git a/config/scripts/pr-workflow-parallelism.test.mjs b/config/scripts/pr-workflow-parallelism.test.mjs index 9f5fa1b504c..4b3e0917906 100644 --- a/config/scripts/pr-workflow-parallelism.test.mjs +++ b/config/scripts/pr-workflow-parallelism.test.mjs @@ -21,8 +21,7 @@ const shellContractFiles = [ const patchedNodePtyContractFiles = [ 'src/main/daemon/node-pty-fd-leak.test.ts', 'src/main/pty/omp-shell-wrapper.node-pty.test.ts', - 'src/shared/fish-query-reply-child-stdin.node-pty.test.ts', - 'src/shared/pty-cooked-querier-reply-delivery.node-pty.test.ts' + 'src/shared/fish-query-reply-child-stdin.node-pty.test.ts' ] const nativeShellContractFiles = [...shellContractFiles, ...patchedNodePtyContractFiles] const testFilePatterns = [ @@ -86,7 +85,6 @@ describe('PR workflow parallelism', () => { expect(shellStep).toBeDefined() expect(shellInstall).toBeDefined() - expect(workflow.jobs.shell_contracts.env.ORCA_REQUIRE_NODE_PTY_ECHO_STATE).toBe('1') expect(shellStep.run.split(/\s+/)).toContain('--maxWorkers=1') // Why the whole workflow, not just the general shards: any other lane installing // these shells would silently start running the real-shell tests twice.