mirrors/nocobase
1
0
Fork 0
mirror of https://github.com/nocobase/nocobase synced 2024-11-15 03:56:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into next

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

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

@ -1,10 +1,14 @@
name: Auto merge main -> next name: Auto merge main -> next
concurrency: concurrency:
group: ${{ github.workflow }}-${{ github.ref }} group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event.inputs.repository }}
cancel-in-progress: true cancel-in-progress: true
on: on:
workflow_dispatch:
inputs:
repository:
description: 'Please enter a repository name'
push: push:
branches: branches:
- 'main' - 'main'
@ -18,7 +22,7 @@ jobs:
with: with:
app-id: ${{ vars.NOCOBASE_APP_ID }} app-id: ${{ vars.NOCOBASE_APP_ID }}
private-key: ${{ secrets.NOCOBASE_APP_PRIVATE_KEY }} private-key: ${{ secrets.NOCOBASE_APP_PRIVATE_KEY }}
repositories: nocobase,pro-plugins,${{ join(fromJSON(vars.PRO_PLUGIN_REPOS), ',') }},${{ join(fromJSON(vars.CUSTOM_PRO_PLUGIN_REPOS), ',') }} repositories: nocobase,pro-plugins,${{ join(fromJSON(vars.NEXT_PRO_PLUGIN_REPOS), ',') }},${{ join(fromJSON(vars.CUSTOM_PRO_PLUGIN_REPOS), ',') }}
skip-token-revoke: true skip-token-revoke: true
- name: Get GitHub App User ID - name: Get GitHub App User ID
id: get-user-id id: get-user-id
@ -28,7 +32,7 @@ jobs:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@v4
with: with:
repository: nocobase/nocobase repository: nocobase/${{ inputs.repository || 'nocobase' }}
token: ${{ steps.app-token.outputs.token }} token: ${{ steps.app-token.outputs.token }}
persist-credentials: true persist-credentials: true
fetch-depth: 0 fetch-depth: 0