mirror of
https://github.com/nocobase/nocobase
synced 2024-11-14 22:15:10 +00:00
Merge branch 'main' into next
This commit is contained in:
commit
976a5d6da7
6
.github/workflows/auto-merge.yml
vendored
6
.github/workflows/auto-merge.yml
vendored
@ -36,7 +36,7 @@ jobs:
|
||||
token: ${{ steps.app-token.outputs.token }}
|
||||
persist-credentials: true
|
||||
fetch-depth: 0
|
||||
- name: main -> next(nocobase)
|
||||
- name: main -> next(${{ inputs.repository || 'nocobase' }})
|
||||
run: |
|
||||
git config --global user.name '${{ steps.app-token.outputs.app-slug }}[bot]'
|
||||
git config --global user.email '${{ steps.get-user-id.outputs.user-id }}+${{ steps.app-token.outputs.app-slug }}[bot]@users.noreply.github.com>'
|
||||
@ -45,11 +45,11 @@ jobs:
|
||||
git checkout next
|
||||
git merge main
|
||||
git push origin next
|
||||
- name: push nocobase(next)
|
||||
- name: push ${{ inputs.repository || 'nocobase' }}(next)
|
||||
uses: ad-m/github-push-action@master
|
||||
with:
|
||||
branch: next
|
||||
github_token: ${{ steps.app-token.outputs.token }}
|
||||
repository: nocobase/nocobase
|
||||
repository: nocobase/${{ inputs.repository || 'nocobase' }}
|
||||
tags: true
|
||||
atomic: true
|
||||
|
Loading…
Reference in New Issue
Block a user