Address review comments

.github/workflows/__all-platform-bundle.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__analysis-kinds.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__analyze-ref-input.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__autobuild-action.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__autobuild-direct-tracing-with-working-dir.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__autobuild-working-dir.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__build-mode-autobuild.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__build-mode-manual.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__build-mode-none.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__build-mode-rollback.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__bundle-from-nightly.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__bundle-from-toolcache.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__bundle-toolcache.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__bundle-zstd.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__cleanup-db-cluster-dir.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__config-export.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__config-input.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__cpp-deptrace-disabled.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__cpp-deptrace-enabled-on-macos.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__cpp-deptrace-enabled.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__diagnostics-export.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__export-file-baseline-information.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__extractor-ram-threads.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__global-proxy.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__go-custom-queries.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__go-indirect-tracing-workaround-diagnostic.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__go-indirect-tracing-workaround-no-file-program.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__go-indirect-tracing-workaround.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__go-tracing-autobuilder.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__go-tracing-custom-build-steps.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__go-tracing-legacy-workflow.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__init-with-registries.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__javascript-source-root.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__job-run-uuid-sarif.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__language-aliases.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__local-bundle.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__multi-language-autodetect.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__overlay-init-fallback.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__packaging-codescanning-config-inputs-js.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__packaging-config-inputs-js.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__packaging-config-js.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__packaging-inputs-js.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__remote-config.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__resolve-environment-action.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__rubocop-multi-language.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__ruby.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__rust.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__split-workflow.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__start-proxy.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__submit-sarif-failure.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__swift-autobuild.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__swift-custom-build.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__unset-environment.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__upload-ref-sha-input.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__upload-sarif.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/__with-checkout-path.yml

@@ -18,7 +18,9 @@ on:
       - synchronize
       - reopened
       - ready_for_review
-  merge_group: {}
+  merge_group:
+    types:
+      - checks_requested
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/check-expected-release-files.yml

@@ -8,7 +8,6 @@ on:
     # Run checks on reopened draft PRs to support triggering PR checks on draft PRs that were opened
     # by other workflows.
     types: [opened, synchronize, reopened, ready_for_review]
-  merge_group:
 
 defaults:
   run:

.github/workflows/codeql.yml

@@ -8,6 +8,7 @@ on:
     # by other workflows.
     types: [opened, synchronize, reopened, ready_for_review]
   merge_group:
+    types: [checks_requested]
   schedule:
     # Weekly on Sunday.
     - cron: '30 1 * * 0'

.github/workflows/codescanning-config-cli.yml

@@ -24,6 +24,7 @@ on:
     - reopened
     - ready_for_review
   merge_group:
+    types: [checks_requested]
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:
@@ -79,7 +80,7 @@ jobs:
     # On PRs, overlay analysis may change the config that is passed to the CLI.
     # Therefore, we have two variants of the following test, one for PRs and one for other events.
     - name: Empty file (non-PR)
-      if: github.event_name != 'pull_request'
+      if: github.event_name != 'pull_request' && github.event_name != 'merge_group'
       uses: ./../action/.github/actions/check-codescanning-config
       with:
         expected-config-file-contents: "{}"
@@ -87,7 +88,7 @@ jobs:
         tools: ${{ steps.prepare-test.outputs.tools-url }}
 
     - name: Empty file (PR)
-      if: github.event_name == 'pull_request'
+      if: github.event_name == 'pull_request' || github.event_name == 'merge_group'
       uses: ./../action/.github/actions/check-codescanning-config
       with:
         expected-config-file-contents: |

.github/workflows/debug-artifacts-failure-safe.yml

@@ -15,6 +15,7 @@ on:
     - reopened
     - ready_for_review
   merge_group:
+    types: [checks_requested]
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/debug-artifacts-safe.yml

@@ -14,6 +14,7 @@ on:
     - reopened
     - ready_for_review
   merge_group:
+    types: [checks_requested]
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/pr-checks.yml

@@ -7,6 +7,7 @@ on:
     # by other workflows.
     types: [opened, synchronize, reopened, ready_for_review]
   merge_group:
+    types: [checks_requested]
   workflow_dispatch:
 
 defaults:
@@ -81,7 +82,7 @@ jobs:
           category: eslint
 
   check-node-version:
-    if: github.event.pull_request && github.triggering_actor != 'dependabot[bot]'
+    if: github.triggering_actor != 'dependabot[bot]'
     name: Check Action Node versions
     runs-on: ubuntu-latest
     timeout-minutes: 45

.github/workflows/python312-windows.yml

@@ -8,6 +8,7 @@ on:
     # by other workflows.
     types: [opened, synchronize, reopened, ready_for_review]
   merge_group:
+    types: [checks_requested]
   schedule:
     # Weekly on Monday.
     - cron: '0 0 * * 1'

.github/workflows/query-filters.yml

@@ -12,6 +12,7 @@ on:
     - reopened
     - ready_for_review
   merge_group:
+    types: [checks_requested]
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

.github/workflows/test-codeql-bundle-all.yml

@@ -14,6 +14,7 @@ on:
     - reopened
     - ready_for_review
   merge_group:
+    types: [checks_requested]
   schedule:
     - cron: '0 5 * * *'
   workflow_dispatch:

pr-checks/sync.py

@@ -308,7 +308,9 @@ for file in sorted((this_dir / 'checks').glob('*.yml')):
                 'pull_request': {
                     'types': ["opened", "synchronize", "reopened", "ready_for_review"]
                 },
-                'merge_group': {},
+                'merge_group': {
+                    'types': ['checks_requested']
+                },
                 'schedule': [{'cron': SingleQuotedScalarString('0 5 * * *')}],
                 'workflow_dispatch': {
                     'inputs': workflowInputs