@tahminator/pipeline 1.0.97 → 1.0.98

package/README.md

@@ -327,6 +327,8 @@ await client.updateK8sTagWithPR({
   environment: "production",
   originRepo: ["tahminator", "pipeline"],
   manifestRepo: ["tahminator", "infra"],
+  // optional: max PR merge attempts (2s apart) before throwing; defaults to 10
+  mergeAttempts: 10,
 });
 
 await client.sendPrMessage({

package/dist/gh/pr/index.d.ts

@@ -51,13 +51,19 @@ export declare class GitHubPRManager {
     private readonly client;
     constructor(client: Octokit);
     uploadDirectoryContents({ owner, repository, sourceDirectory, directory, message, branch, }: UploadDirectoryContentsArgs): Promise<void>;
-    updateK8sTagWithPR({ newTag, imageName, kustomizationFilePath, environment, originRepo, manifestRepo, }: {
+    updateK8sTagWithPR({ newTag, imageName, kustomizationFilePath, environment, originRepo, manifestRepo, mergeAttempts, }: {
         newTag: string;
         imageName: string;
         kustomizationFilePath: string;
         environment: Environment;
         originRepo: [OwnerString, RepoString];
         manifestRepo: [OwnerString, RepoString];
+        /**
+         * max number of times to try merging the created PR before failing
+         *
+         * @default 10
+         */
+        mergeAttempts?: number;
     }): Promise<void>;
     mergePr({ prId, owner, repository, mergeMethod, }: {
         prId: number;

package/dist/gh/pr/index.js

@@ -49,7 +49,7 @@ export class GitHubPRManager {
             sha: commit.sha,
         });
     }
-    async updateK8sTagWithPR({ newTag, imageName, kustomizationFilePath, environment, originRepo, manifestRepo, }) {
+    async updateK8sTagWithPR({ newTag, imageName, kustomizationFilePath, environment, originRepo, manifestRepo, mergeAttempts = 10, }) {
         const [manifestOwner, manifestRepository] = manifestRepo;
         const [originOwner, originRepository] = originRepo;
         const newBranchName = `${imageName}-${newTag}-${Utils.generateShortId()}`;
@@ -111,11 +111,29 @@ export class GitHubPRManager {
             base: baseBranch,
             body: `Automated image tag change to ${newTag} for ${imageName} in ${environment} triggered by [${originOwner}/${originRepository}](https://github.com/${originOwner}/${originRepository}).`,
         });
-        await this.mergePr({
-            prId: pr.number,
-            owner: manifestOwner,
-            repository: manifestRepository,
+        let lastMergeError;
+        const merged = await Utils.waitUntil({
+            attempts: mergeAttempts,
+            intervalMs: 2000,
+            predicate: async (attempt) => {
+                try {
+                    await this.mergePr({
+                        prId: pr.number,
+                        owner: manifestOwner,
+                        repository: manifestRepository,
+                    });
+                    return true;
+                }
+                catch (e) {
+                    lastMergeError = e;
+                    console.warn(`Failed to merge PR #${pr.number} (${attempt}/${mergeAttempts}):`, e);
+                    return false;
+                }
+            },
         });
+        if (!merged) {
+            throw new Error(`Failed to merge PR #${pr.number} after ${mergeAttempts} attempts`, { cause: lastMergeError });
+        }
     }
     async mergePr({ prId, owner, repository, mergeMethod = "squash", }) {
         await this.client.rest.pulls.merge({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tahminator/pipeline",
-  "version": "1.0.97",
+  "version": "1.0.98",
   "description": "A collection of Bun shell scripts that can be re-used in various CICD pipelines.",
   "author": "Tahmid Ahmed",
   "repository": {