Revert "Use grouped version updates for Dependabot (#15920)" (#15932)

.github/dependabot.yml

@@ -28,10 +28,6 @@ updates:
       # Keep both psycopg and psycopg-c together
       patterns:
         - "psycopg*"
-    python-package:
-      # Keep rest of package together
-      patterns:
-        - "*"
 - package-ecosystem: github-actions
   directory: "/"
   schedule:

.github/workflows/ci.yml

@@ -6,7 +6,7 @@ on:
   pull_request:
   merge_group:
     types: [checks_requested]
-  workflow_dispatch:
+  workflow_dispatch:  # generally only for the "combine-prs" workflow
 permissions:
   id-token: write
   contents: read

.github/workflows/combine-prs.yml

@@ -0,0 +1,42 @@
+# Origin: https://github.com/marketplace/actions/combine-prs
+
+name: 'Combine PRs'
+
+# Controls when the action will run - in this case triggered manually
+on:
+  workflow_dispatch:
+    inputs:
+      ignoreLabel:
+        description: 'Exclude PRs with this label'
+        required: true
+        default: 'blocked'
+
+# https://docs.github.com/en/actions/security-guides/automatic-token-authentication#permissions-for-the-github_token
+permissions:
+  contents: write
+  pull-requests: write
+  checks: read
+  actions: write
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "combine-prs"
+  combine-prs:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Use GitHub App Token
+        uses: wow-actions/[email protected]
+        id: generate_token
+        with:
+          app_id: ${{ secrets.COMBINE_PRS_APP_ID }}
+          private_key: ${{ secrets.COMBINE_PRS_PRIVATE_KEY }}
+          fallback: ${{ secrets.GITHUB_TOKEN }} # fall back to the default token if the app token is
+
+      - name: combine-prs
+        id: combine-prs
+        uses: github/[email protected]
+        with:
+          github_token: ${{ steps.generate_token.outputs.BOT_TOKEN }}
+          ignore_label: ${{ github.event.inputs.ignoreLabel || 'blocked' }}

.github/workflows/node-ci.yml

@@ -6,7 +6,7 @@ on:
   pull_request:
   merge_group:
     types: [checks_requested]
-  workflow_dispatch:
+  workflow_dispatch:  # generally only for the "combine-prs" workflow
 permissions:
   contents: read
 concurrency: