From 1b1d560aef38d7f8c65c2ed5476ed544545dfc1e Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Tue, 31 Mar 2026 22:09:16 -0400 Subject: [PATCH] fix: disable GPG signing in test fixtures --- packages/app/e2e/actions.ts | 1 + packages/opencode/test/file/index.test.ts | 14 +++++++------- packages/opencode/test/fixture/fixture.ts | 2 ++ .../opencode/test/project/migrate-global.test.ts | 1 + packages/opencode/test/snapshot/snapshot.test.ts | 2 +- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/packages/app/e2e/actions.ts b/packages/app/e2e/actions.ts index efd370d395c2..027b0e894346 100644 --- a/packages/app/e2e/actions.ts +++ b/packages/app/e2e/actions.ts @@ -375,6 +375,7 @@ export async function createTestProject() { execSync("git init", { cwd: root, stdio: "ignore" }) await fs.writeFile(path.join(root, ".git", "opencode"), id) execSync("git config core.fsmonitor false", { cwd: root, stdio: "ignore" }) + execSync("git config commit.gpgsign false", { cwd: root, stdio: "ignore" }) execSync("git add -A", { cwd: root, stdio: "ignore" }) execSync('git -c user.name="e2e" -c user.email="e2e@example.com" commit -m "init" --allow-empty', { cwd: root, diff --git a/packages/opencode/test/file/index.test.ts b/packages/opencode/test/file/index.test.ts index fae3ac1f2867..cd4f023cc76f 100644 --- a/packages/opencode/test/file/index.test.ts +++ b/packages/opencode/test/file/index.test.ts @@ -403,7 +403,7 @@ describe("file/index Filesystem patterns", () => { const filepath = path.join(tmp.path, "file.txt") await fs.writeFile(filepath, "original\n", "utf-8") await $`git add .`.cwd(tmp.path).quiet() - await $`git commit --no-gpg-sign -m "add file"`.cwd(tmp.path).quiet() + await $`git commit -m "add file"`.cwd(tmp.path).quiet() await fs.writeFile(filepath, "modified\nextra line\n", "utf-8") await Instance.provide({ @@ -441,7 +441,7 @@ describe("file/index Filesystem patterns", () => { const filepath = path.join(tmp.path, "gone.txt") await fs.writeFile(filepath, "content\n", "utf-8") await $`git add .`.cwd(tmp.path).quiet() - await $`git commit --no-gpg-sign -m "add file"`.cwd(tmp.path).quiet() + await $`git commit -m "add file"`.cwd(tmp.path).quiet() await fs.rm(filepath) await Instance.provide({ @@ -460,7 +460,7 @@ describe("file/index Filesystem patterns", () => { await fs.writeFile(path.join(tmp.path, "keep.txt"), "keep\n", "utf-8") await fs.writeFile(path.join(tmp.path, "remove.txt"), "remove\n", "utf-8") await $`git add .`.cwd(tmp.path).quiet() - await $`git commit --no-gpg-sign -m "initial"`.cwd(tmp.path).quiet() + await $`git commit -m "initial"`.cwd(tmp.path).quiet() // Modify one, delete one, add one await fs.writeFile(path.join(tmp.path, "keep.txt"), "changed\n", "utf-8") @@ -510,7 +510,7 @@ describe("file/index Filesystem patterns", () => { for (let i = 0; i < 256; i++) binaryData[i] = i await fs.writeFile(filepath, binaryData) await $`git add .`.cwd(tmp.path).quiet() - await $`git commit --no-gpg-sign -m "add binary"`.cwd(tmp.path).quiet() + await $`git commit -m "add binary"`.cwd(tmp.path).quiet() // Modify the binary const modified = Buffer.alloc(512) for (let i = 0; i < 512; i++) modified[i] = i % 256 @@ -826,7 +826,7 @@ describe("file/index Filesystem patterns", () => { const filepath = path.join(tmp.path, "file.txt") await fs.writeFile(filepath, "original content\n", "utf-8") await $`git add .`.cwd(tmp.path).quiet() - await $`git commit --no-gpg-sign -m "add file"`.cwd(tmp.path).quiet() + await $`git commit -m "add file"`.cwd(tmp.path).quiet() await fs.writeFile(filepath, "modified content\n", "utf-8") await Instance.provide({ @@ -849,7 +849,7 @@ describe("file/index Filesystem patterns", () => { const filepath = path.join(tmp.path, "staged.txt") await fs.writeFile(filepath, "before\n", "utf-8") await $`git add .`.cwd(tmp.path).quiet() - await $`git commit --no-gpg-sign -m "add file"`.cwd(tmp.path).quiet() + await $`git commit -m "add file"`.cwd(tmp.path).quiet() await fs.writeFile(filepath, "after\n", "utf-8") await $`git add .`.cwd(tmp.path).quiet() @@ -868,7 +868,7 @@ describe("file/index Filesystem patterns", () => { const filepath = path.join(tmp.path, "clean.txt") await fs.writeFile(filepath, "unchanged\n", "utf-8") await $`git add .`.cwd(tmp.path).quiet() - await $`git commit --no-gpg-sign -m "add file"`.cwd(tmp.path).quiet() + await $`git commit -m "add file"`.cwd(tmp.path).quiet() await Instance.provide({ directory: tmp.path, diff --git a/packages/opencode/test/fixture/fixture.ts b/packages/opencode/test/fixture/fixture.ts index a50e0c4f614d..03713d879ce2 100644 --- a/packages/opencode/test/fixture/fixture.ts +++ b/packages/opencode/test/fixture/fixture.ts @@ -49,6 +49,7 @@ export async function tmpdir(options?: TmpDirOptions) { if (options?.git) { await $`git init`.cwd(dirpath).quiet() await $`git config core.fsmonitor false`.cwd(dirpath).quiet() + await $`git config commit.gpgsign false`.cwd(dirpath).quiet() await $`git config user.email "test@opencode.test"`.cwd(dirpath).quiet() await $`git config user.name "Test"`.cwd(dirpath).quiet() await $`git commit --allow-empty -m "root commit ${dirpath}"`.cwd(dirpath).quiet() @@ -100,6 +101,7 @@ export function tmpdirScoped(options?: { git?: boolean; config?: Partial { await $`git init`.cwd(tmp.path).quiet() await $`git config user.name "Test"`.cwd(tmp.path).quiet() await $`git config user.email "test@opencode.test"`.cwd(tmp.path).quiet() + await $`git config commit.gpgsign false`.cwd(tmp.path).quiet() const { project: pre } = await Project.fromDirectory(tmp.path) expect(pre.id).toBe(ProjectID.global) diff --git a/packages/opencode/test/snapshot/snapshot.test.ts b/packages/opencode/test/snapshot/snapshot.test.ts index f42cec4fc73f..cca8071dad2a 100644 --- a/packages/opencode/test/snapshot/snapshot.test.ts +++ b/packages/opencode/test/snapshot/snapshot.test.ts @@ -26,7 +26,7 @@ async function bootstrap() { await Filesystem.write(`${dir}/a.txt`, aContent) await Filesystem.write(`${dir}/b.txt`, bContent) await $`git add .`.cwd(dir).quiet() - await $`git commit --no-gpg-sign -m init`.cwd(dir).quiet() + await $`git commit -m init`.cwd(dir).quiet() return { aContent, bContent,