github workflow

This commit is contained in:
庄建国 2022-07-03 09:11:00 +00:00
parent 0f76ab0e15
commit 4fdb6fdea8

View File

@ -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 }}