mirror of
https://github.com/steedos/steedos-platform
synced 2024-11-22 08:10:50 +00:00
github workflow
This commit is contained in:
parent
0f76ab0e15
commit
4fdb6fdea8
18
.github/workflows/release.yml
vendored
18
.github/workflows/release.yml
vendored
@ -128,15 +128,11 @@ jobs:
|
||||
draft: false
|
||||
prerelease: false
|
||||
|
||||
- name: Checkout master branch
|
||||
- name: Merge 2.2 -> master
|
||||
if: ${{ startsWith(steps.branch-name.outputs.tag, '2.2') }} # && steps.version.outputs.is_stable == 'true'}}
|
||||
uses: actions/checkout@v2
|
||||
with:
|
||||
ref: 'master'
|
||||
|
||||
- name: Merge 2.2 to master branch
|
||||
if: ${{ startsWith(steps.branch-name.outputs.tag, '2.2') }} # && steps.version.outputs.is_stable == 'true'}}
|
||||
run: |
|
||||
git merge origin/2.2
|
||||
git push origin
|
||||
|
||||
uses: devmasx/merge-branch@master
|
||||
with:
|
||||
type: now
|
||||
from_branch: 2.2
|
||||
target_branch: master
|
||||
github_token: ${{ github.token }}
|
||||
|
Loading…
Reference in New Issue
Block a user