Merge branch 'next' into develop

.github/workflows/auto-merge.yml

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

.github/workflows/build-pro-image.yml

@@ -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: