Skip to content

Commit 0817dd0

Browse files
committed
chore(release): add merge release branch action.
1 parent 4e675b8 commit 0817dd0

File tree

3 files changed

+19
-2
lines changed

3 files changed

+19
-2
lines changed

.github/workflows/dotnet-test.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ name: .NET Testing
33
on:
44
push:
55
branches:
6-
- '**'
6+
- '!master'
7+
- '!release'
78
pull_request:
89
branches:
910
- '**'
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Sync Release Branch
2+
3+
on: [workflow_dispatch]
4+
5+
jobs:
6+
merge-master:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: actions/checkout@master
10+
11+
- name: Merge master -> release
12+
uses: devmasx/[email protected]
13+
with:
14+
type: now
15+
from_branch: master
16+
target_branch: release
17+
github_token: ${{ github.token }}

.github/workflows/security-analysis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ on:
44
pull_request:
55
branches:
66
- master
7-
- release
87
schedule:
98
- cron: '0 20 * * 5'
109

0 commit comments

Comments
 (0)