fix: branch push

Author: mathio

.github/workflows/docker.yml

@@ -31,4 +31,4 @@ jobs:
           platforms: linux/amd64
           context: ./action
           file: ./action/Dockerfile
-          tags: ${{ secrets.DOCKERHUB_USERNAME }}/ci:v16
+          tags: ${{ secrets.DOCKERHUB_USERNAME }}/ci-action:latest

action/src/flows/_base.ts

@@ -8,6 +8,8 @@ export interface IIntegrationFlow {
 }
 
 export abstract class IntegrationFlow implements IIntegrationFlow {
+  protected i18nBranchName?: string;
+
   constructor(
     protected ora: Ora,
     protected platformKit: PlatformKit,

action/src/flows/in-branch.ts

@@ -19,9 +19,6 @@ 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" });
@@ -33,10 +30,11 @@ export class InBranchFlow extends IntegrationFlow {
       execSync(`git remote -v`, { stdio: "inherit" });
 
       this.ora.start("Pushing changes to remote");
-      execSync(
-        `git push origin ${this.platformKit.platformConfig.baseBranchName} --force`,
-        { stdio: "inherit" },
-      );
+      const currentBranch =
+        this.i18nBranchName ?? this.platformKit.platformConfig.baseBranchName;
+      execSync(`git push origin ${currentBranch} --force`, {
+        stdio: "inherit",
+      });
       this.ora.succeed("Changes pushed to remote");
     }
 
@@ -59,6 +57,12 @@ export class InBranchFlow extends IntegrationFlow {
   }
 
   private configureGit() {
+    this.platformKit?.gitConfig();
+
+    execSync(`git config --global user.name "${gitConfig.userName}"`);
+    execSync(`git config --global user.email "${gitConfig.userEmail}"`);
+    execSync(`git config --global safe.directory ${process.cwd()}`);
+
     const currentAuthor = `${gitConfig.userName} <${gitConfig.userEmail}>`;
     const authorOfLastCommit = execSync(
       `git log -1 --pretty=format:'%an <%ae>'`,
@@ -68,11 +72,6 @@ export class InBranchFlow extends IntegrationFlow {
       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/flows/pull-request.ts

@@ -2,8 +2,6 @@ import { execSync } from "child_process";
 import { InBranchFlow } from "./in-branch.js";
 
 export class PullRequestFlow extends InBranchFlow {
-  private i18nBranchName?: string;
-
   async preRun() {
     const canContinue = await super.preRun?.();
     if (!canContinue) {