mirrors/nginx-ui
1
0
Fork 0
mirror of https://github.com/0xJacky/nginx-ui.git synced 2025-05-12 02:45:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

chore: fix branches workflow

Browse source
This commit is contained in:
Hintay 2024-07-27 14:51:34 +09:00
parent e65ce0d87e
commit e3b0c392ab
No known key found for this signature in database
GPG key ID: 120FC7FF121F2F2D
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
.github/workflows/branches.yml vendored
View file

@ -1,4 +1,4 @@
name: Build Documents name: Merge Branches
on: on:
pull_request: pull_request:
@ -12,11 +12,15 @@ on:
jobs: jobs:
merge: merge:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: github.event.pull_request.merged == true || github.event.release.action == 'released' if: github.event.pull_request.merged == true || github.event.action == 'published'
steps: steps:
- uses: actions/checkout@v4 - name: Checkout main branch
- name: Merge dev to main uses: actions/checkout@v4
with:
ref: 'main'
fetch-depth: 0
- name: Merge dev to main branch
run: | run: |
git checkout main git merge --ff-only -- origin/dev
git pull --no-rebase origin dev git push
git push origin main