update workflows

open-telemetry · Feb 5, 2025 · d025c9d · d025c9d
1 parent ed73c38
commit d025c9d
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 0 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -5,6 +5,7 @@ on:
     branches:
       - main
       - release/*
+  merge_group:
   workflow_dispatch:
 
 permissions:

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -17,6 +17,7 @@ on:
       - v1.*
       - cloudfoundry
       - gh-pages
+  merge_group:
   schedule:
     - cron: "29 13 * * 2"  # weekly at 13:29 UTC on Tuesday
 

diff --git a/.github/workflows/publish-petclinic-benchmark-image.yml b/.github/workflows/publish-petclinic-benchmark-image.yml
@@ -5,6 +5,7 @@ on:
       - "benchmark-overhead/Dockerfile.petclinic"
     branches:
       - main
+  merge_group:
   workflow_dispatch:
 
 permissions:

diff --git a/.github/workflows/publish-smoke-test-early-jdk8-images.yml b/.github/workflows/publish-smoke-test-early-jdk8-images.yml
@@ -7,6 +7,7 @@ on:
       - ".github/workflows/pr-smoke-test-early-jdk8-images.yml"
     branches:
       - main
+  merge_group:
   workflow_dispatch:
 
 permissions:

diff --git a/.github/workflows/publish-smoke-test-fake-backend-images.yml b/.github/workflows/publish-smoke-test-fake-backend-images.yml
@@ -7,6 +7,7 @@ on:
       - ".github/workflows/publish-smoke-test-fake-backend-images.yml"
     branches:
       - main
+  merge_group:
   workflow_dispatch:
 
 permissions:

diff --git a/.github/workflows/publish-smoke-test-grpc-images.yml b/.github/workflows/publish-smoke-test-grpc-images.yml
@@ -8,6 +8,8 @@ on:
       - ".github/workflows/reusable-publish-smoke-test-images.yml"
     branches:
       - main
+  merge_group:
+  workflow_dispatch:
 
 permissions:
   contents: read

diff --git a/.github/workflows/publish-smoke-test-play-images.yml b/.github/workflows/publish-smoke-test-play-images.yml
@@ -8,6 +8,8 @@ on:
       - ".github/workflows/reusable-publish-smoke-test-images.yml"
     branches:
       - main
+  merge_group:
+  workflow_dispatch:
 
 permissions:
   contents: read

diff --git a/.github/workflows/publish-smoke-test-quarkus-images.yml b/.github/workflows/publish-smoke-test-quarkus-images.yml
@@ -8,6 +8,8 @@ on:
       - ".github/workflows/reusable-publish-smoke-test-images.yml"
     branches:
       - main
+  merge_group:
+  workflow_dispatch:
 
 permissions:
   contents: read

diff --git a/.github/workflows/publish-smoke-test-security-manager-images.yml b/.github/workflows/publish-smoke-test-security-manager-images.yml
@@ -8,6 +8,8 @@ on:
       - ".github/workflows/reusable-publish-smoke-test-images.yml"
     branches:
       - main
+  merge_group:
+  workflow_dispatch:
 
 permissions:
   contents: read

diff --git a/.github/workflows/publish-smoke-test-servlet-images.yml b/.github/workflows/publish-smoke-test-servlet-images.yml
@@ -7,6 +7,7 @@ on:
       - ".github/workflows/publish-smoke-test-servlet-images.yml"
     branches:
       - main
+  merge_group:
   workflow_dispatch:
 
 permissions:

diff --git a/.github/workflows/publish-smoke-test-spring-boot-images.yml b/.github/workflows/publish-smoke-test-spring-boot-images.yml
@@ -8,6 +8,8 @@ on:
       - ".github/workflows/reusable-publish-smoke-test-images.yml"
     branches:
       - main
+  merge_group:
+  workflow_dispatch:
 
 permissions:
   contents: read