Skip to content

Commit 32c3724

Browse files
authored
Merge pull request #3 from mixxxdj/sync-branches
ci(actions): Add various fixes/improvements to the sync branches bot
2 parents 9f64299 + 8abffe0 commit 32c3724

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

.github/workflows/sync_branches.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
name: Sync Branches
22
on:
33
push:
4-
- "2.4"
5-
- "2.5"
4+
branches:
5+
- "2.4"
6+
- "2.5"
7+
workflow_dispatch:
68

79
jobs:
810
sync-branches:
911
strategy:
1012
matrix:
1113
include:
12-
- from_branch: 2.4
13-
to_branch: 2.5
14-
- from_branch: 2.5
15-
to_branch: main
14+
- from_branch: "2.4"
15+
to_branch: "2.5"
16+
- from_branch: "2.5"
17+
to_branch: "main"
1618
runs-on: ubuntu-latest
17-
if: ${{ github.ref_name == matrix.to_branch }}
19+
if: ${{ github.event_name == "workflow_dispatch" || github.ref_name == matrix.to_branch }}
1820
steps:
1921
- name: Merge ${{ matrix.from_branch }} into ${{ matrix.to_branch }}
2022
uses: tretuna/[email protected]

0 commit comments

Comments
 (0)