actions/code-review
2
0
Fork 0
Code Pull Requests Actions Releases Activity

Merge pull request 'fix: stage generated review files' (#109) from develop into master

Browse Source 
Reviewed-on: #109
This commit is contained in:
Jeffery
2026-05-15 05:53:55 +00:00
parent 146faca7cb ece7377fc8
commit 1afd978059
2 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/git.js
+5 -1
View File
@@ -5,9 +5,9 @@ import { fileURLToPath } from 'url';
import { GITEA_SERVER_URL, GITEA_REPOSITORY, GITEA_TOKEN, PR_HEAD_BRANCH, FINDINGS_PATH } from './config.js'; import { GITEA_SERVER_URL, GITEA_REPOSITORY, GITEA_TOKEN, PR_HEAD_BRANCH, FINDINGS_PATH } from './config.js';
const ACTION_ROOT = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..'); const ACTION_ROOT = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..');
const GENERATED_SYNC_PATHS = [FINDINGS_PATH, '.gitea/ai-review/exclusions.json'];
const remoteUrl = `${GITEA_SERVER_URL.replace(/\/$/, '')}/${GITEA_REPOSITORY}.git`; const remoteUrl = `${GITEA_SERVER_URL.replace(/\/$/, '')}/${GITEA_REPOSITORY}.git`;
export const SYNC_PATHS = [ export const SYNC_PATHS = [
FINDINGS_PATH,
'.amazonq/rules/triage-findings.md', '.amazonq/rules/triage-findings.md',
'.codex/skills/triage-findings/SKILL.md', '.codex/skills/triage-findings/SKILL.md',
'.codex/skills/triage-findings/agents/openai.yaml', '.codex/skills/triage-findings/agents/openai.yaml',
@@ -86,6 +86,10 @@ export async function commitAndPush(workspace, repoDir, _spawnSync = spawnSync,
if (existingSyncPaths.length > 0) { if (existingSyncPaths.length > 0) {
run(['add', ...existingSyncPaths], repoDir); run(['add', ...existingSyncPaths], repoDir);
} }
const generatedSyncPaths = GENERATED_SYNC_PATHS.filter(relPath => fs.existsSync(path.join(repoDir, relPath)));
if (generatedSyncPaths.length > 0) {
run(['add', ...generatedSyncPaths], repoDir);
}
const status = run(['status', '--porcelain'], repoDir); const status = run(['status', '--porcelain'], repoDir);
if (!status) { if (!status) {
app/git.test.js
+21 -13
View File
@@ -94,20 +94,28 @@ describe('commitAndPush', () => {
}); });
it('adds skill and entry files together with findings', async () => { it('adds skill and entry files together with findings', async () => {
const repoDir = path.join(workspace, 'repo');
fs.mkdirSync(path.join(repoDir, '.gitea/ai-review'), { recursive: true });
fs.writeFileSync(path.join(repoDir, '.gitea/ai-review/findings.json'), '[]\n');
fs.writeFileSync(path.join(repoDir, '.gitea/ai-review/exclusions.json'), '[]\n');
const spawn = makeSpawn(); const spawn = makeSpawn();
await commitAndPush(workspace, path.join(workspace, 'repo'), spawn, sourceRoot); await commitAndPush(workspace, repoDir, spawn, sourceRoot);
const addCall = spawn.calls.find(c => c.args[0] === 'add'); const addCalls = spawn.calls.filter(c => c.args[0] === 'add');
assert.ok(addCall, 'expected git add to run'); const skillAddCall = addCalls.find(c => c.args.includes('.github/skills/triage-findings/SKILL.md'));
assert.ok(addCall.args.includes('.github/skills/triage-findings/SKILL.md')); const generatedAddCall = addCalls.find(c => c.args.includes('.gitea/ai-review/exclusions.json'));
assert.ok(addCall.args.includes('.codex/skills/triage-findings/SKILL.md')); assert.ok(skillAddCall, 'expected git add for synced skill files');
assert.ok(addCall.args.includes('.codex/skills/triage-findings/agents/openai.yaml')); assert.ok(generatedAddCall, 'expected git add for generated review files');
assert.ok(addCall.args.includes('.claude/skills/triage-findings/SKILL.md')); assert.ok(skillAddCall.args.includes('.codex/skills/triage-findings/SKILL.md'));
assert.ok(addCall.args.includes('.gemini/skills/triage-findings/SKILL.md')); assert.ok(skillAddCall.args.includes('.codex/skills/triage-findings/agents/openai.yaml'));
assert.ok(addCall.args.includes('.github/copilot-instructions.md')); assert.ok(skillAddCall.args.includes('.claude/skills/triage-findings/SKILL.md'));
assert.ok(addCall.args.includes('.amazonq/rules/triage-findings.md')); assert.ok(skillAddCall.args.includes('.gemini/skills/triage-findings/SKILL.md'));
assert.ok(addCall.args.includes('CLAUDE.md')); assert.ok(skillAddCall.args.includes('.github/copilot-instructions.md'));
assert.ok(addCall.args.includes('GEMINI.md')); assert.ok(skillAddCall.args.includes('.amazonq/rules/triage-findings.md'));
assert.ok(!addCall.args.includes('README.md')); assert.ok(skillAddCall.args.includes('CLAUDE.md'));
assert.ok(skillAddCall.args.includes('GEMINI.md'));
assert.ok(!skillAddCall.args.includes('README.md'));
assert.ok(generatedAddCall.args.includes('.gitea/ai-review/findings.json'));
assert.ok(generatedAddCall.args.includes('.gitea/ai-review/exclusions.json'));
}); });
it('keeps repo copies when the source sync file is missing', async () => { it('keeps repo copies when the source sync file is missing', async () => {