Merge branch 'next' into develop
Some checks are pending
E2E / Build (push) Waiting to run
E2E / Core and plugins (push) Blocked by required conditions
E2E / plugin-workflow (push) Blocked by required conditions
E2E / plugin-workflow-approval (push) Blocked by required conditions
E2E / plugin-data-source-main (push) Blocked by required conditions
E2E / Comment on PR (push) Blocked by required conditions
NocoBase frontEnd test / frontend-test (20) (push) Waiting to run

This commit is contained in:
xilesun 2024-11-25 18:02:50 +08:00
commit baa5ab8ada
2 changed files with 22 additions and 23 deletions

View File

@ -18,10 +18,10 @@ on:
- main
- next
default: main
push:
branches:
- 'main'
- 'next'
# push:
# branches:
# - 'main'
# - 'next'
jobs:
push-commit:

View File

@ -5,25 +5,24 @@ concurrency:
cancel-in-progress: true
on:
push:
branches:
- 'develop'
- 'main'
- 'next'
- 'develop'
paths:
- 'packages/**'
- 'Dockerfile.pro'
- 'package.json'
- '.github/workflows/build-pro-image.yml'
pull_request:
branches:
- '**'
paths:
- 'packages/**'
- 'docker/nocobase/**'
- 'Dockerfile'
- '.github/workflows/build-docker-image.yml'
workflow_dispatch:
# push:
# branches:
# - 'main'
# - 'next'
# - 'develop'
# paths:
# - 'packages/**'
# - 'Dockerfile'
# - '.github/workflows/build-pro-image.yml'
# pull_request:
# branches:
# - '**'
# paths:
# - 'packages/**'
# - 'docker/nocobase/**'
# - 'Dockerfile'
# - '.github/workflows/build-docker-image.yml'
jobs:
get-plugins: