File tree Expand file tree Collapse file tree 4 files changed +8
-10
lines changed
Expand file tree Collapse file tree 4 files changed +8
-10
lines changed Original file line number Diff line number Diff line change 3131 platforms : linux/amd64
3232 context : ./action
3333 file : ./action/Dockerfile
34- tags : ${{ secrets.DOCKERHUB_USERNAME }}/ci:v16
34+ tags : ${{ secrets.DOCKERHUB_USERNAME }}/ci:v18
Original file line number Diff line number Diff line change @@ -8,6 +8,8 @@ export interface IIntegrationFlow {
88}
99
1010export abstract class IntegrationFlow implements IIntegrationFlow {
11+ protected i18nBranchName ?: string ;
12+
1113 constructor (
1214 protected ora : Ora ,
1315 protected platformKit : PlatformKit ,
Original file line number Diff line number Diff line change @@ -19,9 +19,6 @@ export class InBranchFlow extends IntegrationFlow {
1919 const hasChanges = this . checkCommitableChanges ( ) ;
2020 this . ora . succeed ( hasChanges ? "Changes detected" : "No changes detected" ) ;
2121
22- execSync ( `git status` , { stdio : "inherit" } ) ;
23- execSync ( `git branch` , { stdio : "inherit" } ) ;
24-
2522 if ( hasChanges ) {
2623 this . ora . start ( "Committing changes" ) ;
2724 execSync ( `git add .` , { stdio : "inherit" } ) ;
@@ -33,10 +30,11 @@ export class InBranchFlow extends IntegrationFlow {
3330 execSync ( `git remote -v` , { stdio : "inherit" } ) ;
3431
3532 this . ora . start ( "Pushing changes to remote" ) ;
36- execSync (
37- `git push origin ${ this . platformKit . platformConfig . baseBranchName } --force` ,
38- { stdio : "inherit" } ,
39- ) ;
33+ const currentBranch =
34+ this . i18nBranchName ?? this . platformKit . platformConfig . baseBranchName ;
35+ execSync ( `git push origin ${ currentBranch } --force` , {
36+ stdio : "inherit" ,
37+ } ) ;
4038 this . ora . succeed ( "Changes pushed to remote" ) ;
4139 }
4240
Original file line number Diff line number Diff line change @@ -2,8 +2,6 @@ import { execSync } from "child_process";
22import { InBranchFlow } from "./in-branch.js" ;
33
44export class PullRequestFlow extends InBranchFlow {
5- private i18nBranchName ?: string ;
6-
75 async preRun ( ) {
86 const canContinue = await super . preRun ?.( ) ;
97 if ( ! canContinue ) {
You can’t perform that action at this time.
0 commit comments