⭐️⭐️⭐️ Open-source, self-hosted alternative to Linear and Plane. Project management and issue tracking where teams and AI agents work side by side to plan and ship products.
TypeScript agenticagileai-agentsbug-reportingbug-trackerganttissue-trackerjirajira-alternativekanbanlinearlinear-alternativeopen-sourceproduct-managementproject-managementroadmapself-hostedsprint-planningteam-collaborationtrello-alternative
fix(git): attach post-merge release pipelines (#275)
I'm Groot 🌳ad895a4c1289
diff --git a/apps/api/src/modules/git/__tests__/integration/git-webhook.test.ts b/apps/api/src/modules/git/__tests__/integration/git-webhook.test.tsindex fe0d20c9..d4b7bb07 100644--- a/apps/api/src/modules/git/__tests__/integration/git-webhook.test.ts+++ b/apps/api/src/modules/git/__tests__/integration/git-webhook.test.ts@@ -139,6 +139,7 @@ function gitlabPayload(action = 'merge',headSha = 'gitlab-head-1',sourceBranch = 'feature/site',+ mergeCommitSha?: string,) {return {object_kind: 'merge_request',@@ -151,6 +152,7 @@ function gitlabPayload(source_branch: sourceBranch,target_branch: 'main',last_commit: { id: headSha },+ merge_commit_sha: mergeCommitSha,},project: {path_with_namespace: 'acme/site',@@ -927,6 +929,88 @@ describe('Repository webhook', () => {});});+ it('attaches a post-merge GitLab release pipeline to its work item', async () => {+ const { asOwner, webhookId, secret, columns } = await setupProject();+ const issue = (await createIssue(asOwner, columns[0].id)).data!;+ const sourceBranch = 'release/production';+ const headers = () => ({+ 'x-gitlab-token': secret,+ 'idempotency-key': crypto.randomUUID(),+ });++ await deliverRaw(+ webhookId,+ gitlabPayload(`Refs MKT-${issue.sequenceNumber}`, 'open', 'gitlab-source-head', sourceBranch),+ { 'x-gitlab-event': 'Merge Request Hook', ...headers() },+ );+ await deliverRaw(+ webhookId,+ {+ object_kind: 'pipeline',+ object_attributes: {+ id: 99,+ status: 'success',+ ref: sourceBranch,+ sha: 'gitlab-source-head',+ },+ merge_request: { iid: 7, source_branch: sourceBranch },+ project: {+ path_with_namespace: 'acme/site',+ default_branch: 'main',+ web_url: 'https://gitlab.com/acme/site',+ },+ },+ { 'x-gitlab-event': 'Pipeline Hook', ...headers() },+ );++ await deliverRaw(+ webhookId,+ gitlabPayload(+ `Fixes MKT-${issue.sequenceNumber}`,+ 'merge',+ 'gitlab-source-head',+ sourceBranch,+ 'gitlab-merge-head',+ ),+ { 'x-gitlab-event': 'Merge Request Hook', ...headers() },+ );+ expect((await issueState(asOwner, issue.id)).development[0]).toMatchObject({+ state: 'merged',+ headSha: 'gitlab-merge-head',+ pipelineStatus: 'success',+ });++ const pipeline = await deliverRaw(+ webhookId,+ {+ object_kind: 'pipeline',+ object_attributes: {+ id: 100,+ status: 'running',+ ref: 'v1.2.3',+ sha: 'gitlab-merge-head',+ },+ project: {+ path_with_namespace: 'acme/site',+ default_branch: 'main',+ web_url: 'https://gitlab.com/acme/site',+ },+ },+ { 'x-gitlab-event': 'Pipeline Hook', ...headers() },+ );++ expect(pipeline.data).toMatchObject({ handled: 'pipeline' });+ expect((await issueState(asOwner, issue.id)).development[0]).toMatchObject({+ provider: 'gitlab',+ number: 7,+ state: 'merged',+ sourceBranch,+ headSha: 'gitlab-merge-head',+ pipelineStatus: 'running',+ pipelineUrl: 'https://gitlab.com/acme/site/-/pipelines/100',+ });+ });+it('ignores a late GitLab pipeline from the previous head SHA', async () => {const { asOwner, webhookId, secret, columns } = await setupProject();const issue = (await createIssue(asOwner, columns[0].id)).data!;diff --git a/apps/api/src/modules/git/__tests__/unit/providers.test.ts b/apps/api/src/modules/git/__tests__/unit/providers.test.tsindex 585c0ca4..e8300362 100644--- a/apps/api/src/modules/git/__tests__/unit/providers.test.ts+++ b/apps/api/src/modules/git/__tests__/unit/providers.test.ts@@ -34,6 +34,53 @@ describe('repository provider events', () => {});});+ it('uses the GitLab merge commit SHA after a merge', () => {+ const headers = { 'x-gitlab-event': 'Merge Request Hook' };+ const provider = detectProvider(headers)!;+ expect(+ provider.parse(+ {+ object_kind: 'merge_request',+ object_attributes: {+ iid: 7,+ action: 'merge',+ title: 'Release',+ source_branch: 'release/production',+ target_branch: 'main',+ last_commit: { id: 'source-head' },+ merge_commit_sha: 'merge-head',+ },+ project: { path_with_namespace: 'acme/site', default_branch: 'main' },+ },+ headers,+ ),+ ).toMatchObject({ kind: 'pull_request', action: 'merged', headSha: 'merge-head' });+ });++ it('falls back to the GitLab squash commit SHA after a merge', () => {+ const headers = { 'x-gitlab-event': 'Merge Request Hook' };+ const provider = detectProvider(headers)!;+ expect(+ provider.parse(+ {+ object_kind: 'merge_request',+ object_attributes: {+ iid: 8,+ action: 'merge',+ title: 'Squashed release',+ source_branch: 'release/squashed',+ target_branch: 'main',+ last_commit: { id: 'source-head' },+ merge_commit_sha: null,+ squash_commit_sha: 'squash-head',+ },+ project: { path_with_namespace: 'acme/site', default_branch: 'main' },+ },+ headers,+ ),+ ).toMatchObject({ kind: 'pull_request', action: 'merged', headSha: 'squash-head' });+ });+it('normalizes a completed GitHub check run', () => {const headers = { 'x-github-event': 'check_run' };const provider = detectProvider(headers)!;diff --git a/apps/api/src/modules/git/development.ts b/apps/api/src/modules/git/development.tsindex ab2195ec..2021bb46 100644--- a/apps/api/src/modules/git/development.ts+++ b/apps/api/src/modules/git/development.ts@@ -147,7 +147,7 @@ function pullRequestValues(event: PullRequestEvent, updatedAt: Date) {function pullRequestUpdateValues(event: PullRequestEvent, updatedAt: Date) {const values = pullRequestValues(event, updatedAt);- if (!event.headSha) return values;+ if (!event.headSha || event.action === 'merged') return values;return {...values,pipelineStatus: sql<diff --git a/apps/api/src/modules/git/providers.ts b/apps/api/src/modules/git/providers.tsindex 106c3a8e..063d9c98 100644--- a/apps/api/src/modules/git/providers.ts+++ b/apps/api/src/modules/git/providers.ts@@ -294,6 +294,8 @@ interface GitlabPayload {target_branch?: string;sha?: string;last_commit?: { id?: string };+ merge_commit_sha?: string | null;+ squash_commit_sha?: string | null;draft?: boolean;work_in_progress?: boolean;};@@ -374,7 +376,10 @@ const gitlab: GitProvider = {repo: project.path_with_namespace,sourceBranch: mr.source_branch ?? null,targetBranch: mr.target_branch ?? '',- headSha: mr.last_commit?.id ?? null,+ headSha:+ (merged ? (mr.merge_commit_sha ?? mr.squash_commit_sha) : null) ??+ mr.last_commit?.id ??+ null,defaultBranch: project.default_branch ?? null,draft: mr.draft === true || mr.work_in_progress === true,};