Skip to content

Commit 71c5c36

Browse files
committed
ci: hard code branches
1 parent 61efce6 commit 71c5c36

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

.github/workflows/gitflow-sync-develop.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ on:
1111
workflow_dispatch:
1212

1313
env:
14-
DEV_BRANCH: develop
14+
SOURCE_BRANCH: master
15+
TARGET_BRANCH: develop
1516

1617
jobs:
1718
main:
@@ -29,9 +30,10 @@ jobs:
2930
id: open-pr
3031
uses: repo-sync/pull-request@v2
3132
with:
32-
destination_branch: ${{ env.DEV_BRANCH }}
33-
pr_title: '[Gitflow] Merge ${{ github.ref_name }} into ${{ env.DEV_BRANCH }}'
34-
pr_body: 'Merge ${{ github.ref_name }} branch into ${{ env.DEV_BRANCH }}'
33+
source_branch: ${{ env.SOURCE_BRANCH }}
34+
destination_branch: ${{ env.TARGET_BRANCH }}
35+
pr_title: '[Gitflow] Merge ${{ env.SOURCE_BRANCH }} into ${{ env.TARGET_BRANCH }}'
36+
pr_body: 'Merge ${{ env.SOURCE_BRANCH }} branch into ${{ env.TARGET_BRANCH }}'
3537
pr_label: 'Dev: Gitflow'
3638

3739
# https://github.com/marketplace/actions/enable-pull-request-automerge

.github/workflows/gitflow-sync-master.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ on:
1313
workflow_dispatch:
1414

1515
env:
16-
MAIN_BRANCH: master
16+
SOURCE_BRANCH: develop
17+
TARGET_BRANCH: master
1718

1819
jobs:
1920
main:
@@ -31,9 +32,10 @@ jobs:
3132
id: open-pr
3233
uses: repo-sync/pull-request@v2
3334
with:
34-
destination_branch: ${{ env.MAIN_BRANCH }}
35-
pr_title: '[Gitflow] Merge ${{ github.ref_name }} into ${{ env.MAIN_BRANCH }}'
36-
pr_body: 'Merge ${{ github.ref_name }} branch into ${{ env.MAIN_BRANCH }}'
35+
source_branch: ${{ env.SOURCE_BRANCH }}
36+
destination_branch: ${{ env.TARGET_BRANCH }}
37+
pr_title: '[Gitflow] Merge ${{ env.SOURCE_BRANCH }} into ${{ env.TARGET_BRANCH }}'
38+
pr_body: 'Merge ${{ env.SOURCE_BRANCH }} branch into ${{ env.TARGET_BRANCH }}'
3739
pr_label: 'Dev: Gitflow'
3840

3941
# https://github.com/marketplace/actions/enable-pull-request-automerge

0 commit comments

Comments
 (0)