chore(ci): ensure merge queue runs the same CI checks when testing the soon-to-be merged PR as they ran on it

Author: darccio

.github/workflows/api-check.yml

@@ -2,6 +2,10 @@ name: API Stability Check
 
 on:
   pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
     paths:
       - 'ddtrace/tracer/**'
       - 'scripts/apiextractor/**'

.github/workflows/appsec.yml

@@ -10,19 +10,26 @@ on:
   schedule: # nightly
     - cron: "0 0 * * *"
   pull_request: # on pull requests touching appsec files
+    types:
+      - opened
+      - synchronize
+      - reopened
     paths:
       - '.github/workflows/appsec.yml'
       - 'internal/appsec/**'
       - 'appsec/**'
       - 'contrib/**/appsec.go'
       - '**/go.mod'
-  merge_group:
   push:
-    branches: release-v*
+    branches:
+      - release-v*
+      - mq-working-branch-**
     tags-ignore:
       - 'contrib/**'
       - 'instrumentation/**'
-
+      - 'internal/**'
+      - 'orchestrion/**'
+      - 'scripts/**'
 env:
   DD_APPSEC_WAF_TIMEOUT: 1m
   PACKAGES: >-

.github/workflows/codeql-analysis.yml

@@ -7,15 +7,11 @@ on:
         description: 'The branch to run the workflow on'
         required: true
         type: string
-  push:
-    branches: [ main, master ]
-    tags-ignore:
-      - 'contrib/**'
-      - 'instrumentation/**'
   pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ main ]
-  merge_group:
+    types:
+      - opened
+      - synchronize
+      - reopened
 
 jobs:
   analyze:

.github/workflows/ecosystems-label-pr.yml

@@ -1,12 +1,12 @@
 name: Label APM Ecosystems Pull Requests
 on:
   pull_request:
-    paths:
-      - "contrib/**"
     types:
       - opened
       - reopened
       - edited
+    paths:
+      - "contrib/**"
 permissions:
   contents: read
   pull-requests: write

.github/workflows/generate.yml

@@ -3,12 +3,13 @@ name: Generate
 on:
   push:
     branches:
-      - main
       - release-*
+      - mq-working-branch-**
   pull_request:
-    branches:
-      - main
-      - release-*
+    types:
+      - opened
+      - synchronize
+      - reopened
   workflow_call:
     inputs:
       go-version:

.github/workflows/govulncheck.yml

@@ -8,11 +8,14 @@ on:
         type: string
   push:
     branches:
-      - main
       - release-v*
+      - mq-working-branch-**
     tags-ignore:
       - 'contrib/**'
       - 'instrumentation/**'
+      - 'internal/**'
+      - 'orchestrion/**'
+      - 'scripts/**'
   schedule:
     - cron: '00 00 * * *'
   workflow_dispatch:

.github/workflows/main-branch-tests.yml

@@ -9,11 +9,14 @@ on:
         type: string
   push:
     branches:
-      - main
       - release-v*
+      - mq-working-branch-**
     tags-ignore:
       - 'contrib/**'
       - 'instrumentation/**'
+      - 'internal/**'
+      - 'orchestrion/**'
+      - 'scripts/**'
 
 concurrency:
   group: ${{ github.ref }}

.github/workflows/orchestrion.yml

@@ -15,13 +15,20 @@ on:
       DD_API_KEY:
         required: false
   pull_request:
-  merge_group:
+    types:
+      - opened
+      - synchronize
+      - reopened
   push:
     branches:
       - release-v*
+      - mq-working-branch-**
     tags-ignore:
       - 'contrib/**'
       - 'instrumentation/**'
+      - 'internal/**'
+      - 'orchestrion/**'
+      - 'scripts/**'
 
 permissions: read-all
 

.github/workflows/parametric-tests.yml

@@ -9,15 +9,19 @@ on:
         type: string
   push:
     branches:
-      - main
       - release-v*
+      - mq-working-branch-**
     tags-ignore:
       - 'contrib/**'
       - 'instrumentation/**'
+      - 'internal/**'
+      - 'orchestrion/**'
+      - 'scripts/**'
   pull_request:
-    branches:
-      - "**"
-  merge_group:
+    types:
+      - opened
+      - synchronize
+      - reopened
   workflow_dispatch:
     inputs:
       ref:

.github/workflows/pull-request-title-validation.yml

@@ -2,7 +2,10 @@ name: Validate PR Title
 
 on:
   pull_request:
-    types: [opened, edited,reopened,synchronize]
+    types:
+      - opened
+      - edited
+      - reopened
 
 jobs:
   check-title: