chore: refactor to simplify usage with single docker image

works with in-branch flow on gitlab

Author: mathio

.github/workflows/docker.yml

@@ -24,19 +24,11 @@ jobs:
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      # - name: Build BitBucket image and push
-      #   uses: docker/build-push-action@v6
-      #   with:
-      #     push: true
-      #     platforms: linux/amd64
-      #     context: ./action
-      #     file: ./action/Dockerfile-bitbucket
-      #     tags: ${{ secrets.DOCKERHUB_USERNAME }}/bitbucket:latest
-      - name: Build Gitlab image and push
+      - name: Build BitBucket image and push
         uses: docker/build-push-action@v6
         with:
           push: true
           platforms: linux/amd64
           context: ./action
-          file: ./action/Dockerfile-gitlab
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/gitlab:v8
+          file: ./action/Dockerfile
+          tags: ${{ secrets.DOCKERHUB_USERNAME }}/ci:v16

action/Dockerfile

@@ -19,4 +19,4 @@ RUN npm install -g pnpm && pnpm install
 RUN pnpm build
 
 # Run the Node.js / TypeScript application
-ENTRYPOINT ["node", "/app/build/github.js"]
+ENTRYPOINT ["node", "/app/build/index.js"]

action/Dockerfile-bitbucket

@@ -2,7 +2,7 @@ import { Ora } from "ora";
 import { PlatformKit } from "../platforms/_base.js";
 
 export interface IIntegrationFlow {
-  preRun?(): Promise<void>;
+  preRun?(): Promise<boolean>;
   run(): Promise<boolean>;
   postRun?(): Promise<void>;
 }
@@ -15,3 +15,8 @@ export abstract class IntegrationFlow implements IIntegrationFlow {
 
   abstract run(): Promise<boolean>;
 }
+
+export const gitConfig = {
+  userName: "Replexica",
+  userEmail: "support@replexica.com",
+};

action/Dockerfile-gitlab

@@ -1,11 +1,13 @@
 import { execSync } from "child_process";
-import { IntegrationFlow } from "./_base.js";
+import { gitConfig, IntegrationFlow } from "./_base.js";
 
 export class InBranchFlow extends IntegrationFlow {
   async preRun() {
     this.ora.start("Configuring git");
-    this.configureGit();
+    const canContinue = this.configureGit();
     this.ora.succeed("Git configured");
+
+    return canContinue;
   }
 
   async run() {
@@ -17,6 +19,9 @@ export class InBranchFlow extends IntegrationFlow {
     const hasChanges = this.checkCommitableChanges();
     this.ora.succeed(hasChanges ? "Changes detected" : "No changes detected");
 
+    execSync(`git status`, { stdio: "inherit" });
+    execSync(`git branch`, { stdio: "inherit" });
+
     if (hasChanges) {
       this.ora.start("Committing changes");
       execSync(`git add .`, { stdio: "inherit" });
@@ -25,8 +30,13 @@ export class InBranchFlow extends IntegrationFlow {
       });
       this.ora.succeed("Changes committed");
 
+      execSync(`git remote -v`, { stdio: "inherit" });
+
       this.ora.start("Pushing changes to remote");
-      execSync(`git push origin HEAD --force`, { stdio: "inherit" });
+      execSync(
+        `git push origin ${this.platformKit.platformConfig.baseBranchName} --force`,
+        { stdio: "inherit" },
+      );
       this.ora.succeed("Changes pushed to remote");
     }
 
@@ -49,9 +59,20 @@ export class InBranchFlow extends IntegrationFlow {
   }
 
   private configureGit() {
-    execSync('git config --global user.name "Replexica"');
-    execSync('git config --global user.email "support@replexica.com"');
+    const currentAuthor = `${gitConfig.userName} <${gitConfig.userEmail}>`;
+    const authorOfLastCommit = execSync(
+      `git log -1 --pretty=format:'%an <%ae>'`,
+    ).toString();
+    if (authorOfLastCommit === currentAuthor) {
+      this.ora.fail(`The action will not run on commits by ${currentAuthor}`);
+      return false;
+    }
+
+    execSync(`git config --global user.name "${gitConfig.userName}"`);
+    execSync(`git config --global user.email "${gitConfig.userEmail}"`);
     execSync(`git config --global safe.directory ${process.cwd()}`);
     this.platformKit?.gitConfig();
+
+    return true;
   }
 }

action/src/bitbucket.ts

@@ -5,7 +5,10 @@ export class PullRequestFlow extends InBranchFlow {
   private i18nBranchName?: string;
 
   async preRun() {
-    await super.preRun?.();
+    const canContinue = await super.preRun?.();
+    if (!canContinue) {
+      return false;
+    }
 
     this.ora.start("Calculating automated branch name");
     this.i18nBranchName = this.calculatePrBranchName();
@@ -32,6 +35,8 @@ export class PullRequestFlow extends InBranchFlow {
       this.createI18nBranch(this.i18nBranchName);
       this.ora.succeed(`Created branch ${this.i18nBranchName}`);
     }
+
+    return true;
   }
 
   async postRun() {