fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-05-07 22:49:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into next

Browse Source
This commit is contained in:
nocobase[bot] 2024-10-18 05:02:04 +00:00
commit 976a5d6da7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/auto-merge.yml vendored
View File

@ -36,7 +36,7 @@ jobs:
token: ${{ steps.app-token.outputs.token }} token: ${{ steps.app-token.outputs.token }}
persist-credentials: true persist-credentials: true
fetch-depth: 0 fetch-depth: 0
- name: main -> next(nocobase) - name: main -> next(${{ inputs.repository || 'nocobase' }})
run: | run: |
git config --global user.name '${{ steps.app-token.outputs.app-slug }}[bot]' 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>' 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 checkout next
git merge main git merge main
git push origin next git push origin next
- name: push nocobase(next) - name: push ${{ inputs.repository || 'nocobase' }}(next)
uses: ad-m/github-push-action@master uses: ad-m/github-push-action@master
with: with:
branch: next branch: next
github_token: ${{ steps.app-token.outputs.token }} github_token: ${{ steps.app-token.outputs.token }}
repository: nocobase/nocobase repository: nocobase/${{ inputs.repository || 'nocobase' }}
tags: true tags: true
atomic: true atomic: true