diff --git a/.github/workflows/branches.yml b/.github/workflows/branches.yml new file mode 100644 index 0000000..90e414e --- /dev/null +++ b/.github/workflows/branches.yml @@ -0,0 +1,22 @@ +name: Build Documents + +on: + pull_request: + branches: + - 'dev' + types: [ closed ] + release: + types: + - published + +jobs: + merge: + runs-on: ubuntu-latest + if: github.event.pull_request.merged == true || github.event.release.action == 'released' + steps: + - uses: actions/checkout@v4 + - name: Merge dev to main + run: | + git checkout main + git pull --no-rebase origin dev + git push origin main diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f048d7b..96c8a50 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,6 +4,7 @@ on: push: branches: - '*' + - '!main' paths: - "app/**/*.js" - "app/**/*.vue" diff --git a/.github/workflows/documents.yml b/.github/workflows/documents.yml index 874ef9e..89c8720 100644 --- a/.github/workflows/documents.yml +++ b/.github/workflows/documents.yml @@ -4,6 +4,7 @@ on: push: branches: - '*' + - '!main' paths: - "docs/**/*.js" - "docs/**/*.ts"