Merge branch 'main' into next

This commit is contained in:
nocobase[bot] 2024-10-28 11:12:14 +00:00
commit 8fbf87024a
2 changed files with 4 additions and 0 deletions

View File

@ -4,6 +4,8 @@ concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event.inputs.pr_number }}-${{ github.event.inputs.nocobase_pr_number }} group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event.inputs.pr_number }}-${{ github.event.inputs.nocobase_pr_number }}
cancel-in-progress: true cancel-in-progress: true
run-name: Build pro image ${{ github.ref }}-${{ inputs.pr_number }}-${{ inputs.nocobase_pr_number }}
on: on:
workflow_dispatch: workflow_dispatch:
inputs: inputs:

View File

@ -4,6 +4,8 @@ concurrency:
group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event.inputs.pro_plugin }}-${{ github.events.inputs.pr_number }}-${{ github.events.inputs.nocobase_pr_number }} group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event.inputs.pro_plugin }}-${{ github.events.inputs.pr_number }}-${{ github.events.inputs.nocobase_pr_number }}
cancel-in-progress: true cancel-in-progress: true
run-name: Build pro plugin image ${{ github.ref }}-${{ github.event.inputs.pro_plugin }}-${{ github.events.inputs.pr_number }}-${{ github.events.inputs.nocobase_pr_number }}
on: on:
workflow_dispatch: workflow_dispatch:
inputs: inputs: