From 6ae5403f751d43622075778dcc1ea3f198b87892 Mon Sep 17 00:00:00 2001
From: Ulysse Mavrocordatos <ulysse.mavrocordatos@datadoghq.com>
Date: Wed, 24 Sep 2025 15:44:51 +0200
Subject: [PATCH 1/2] fix the concurrency group of the integration workflow

---
 .github/workflows/reusable-integration-test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/reusable-integration-test.yml b/.github/workflows/reusable-integration-test.yml
index 4798a72bdae..a083199be7b 100644
--- a/.github/workflows/reusable-integration-test.yml
+++ b/.github/workflows/reusable-integration-test.yml
@@ -63,7 +63,7 @@ on:
         required: false
 
 concurrency:
-  group: integration-${{ github.head_ref }}
+  group: integration-ruby-${{ inputs.target-branch || github.head_ref }}
   cancel-in-progress: true
 
 jobs:

From b0202d3fa41496b1831add65beea8e0bc273aec7 Mon Sep 17 00:00:00 2001
From: Ulysse Mavrocordatos <ulysse.mavrocordatos@datadoghq.com>
Date: Thu, 25 Sep 2025 10:02:56 +0200
Subject: [PATCH 2/2] fix: remove duplicate conditional logic from reusable
 workflows

The reusable workflows had duplicate conditions that don't work properly in
workflow_call context since github.event.pull_request is not available.
The main test.yml workflow already handles these conditions correctly.
---
 .github/workflows/reusable-examples.yml   | 5 -----
 .github/workflows/reusable-pre-commit.yml | 5 -----
 .github/workflows/reusable-ruby-test.yml  | 1 -
 3 files changed, 11 deletions(-)

diff --git a/.github/workflows/reusable-examples.yml b/.github/workflows/reusable-examples.yml
index 90a2ea764cb..06583ec96f1 100644
--- a/.github/workflows/reusable-examples.yml
+++ b/.github/workflows/reusable-examples.yml
@@ -22,11 +22,6 @@ on:
 jobs:
   examples:
     runs-on: ubuntu-latest
-    if: >
-      (github.event.pull_request.draft == false &&
-       !contains(github.event.pull_request.labels.*.name, 'ci/skip') &&
-       !contains(github.event.pull_request.head.ref, 'datadog-api-spec/test/')) ||
-      github.event_name == 'schedule'
     env:
       DD_PROFILING_NO_EXTENSION: true
     steps:
diff --git a/.github/workflows/reusable-pre-commit.yml b/.github/workflows/reusable-pre-commit.yml
index 27bf9957a4f..a8b1c7bb58d 100644
--- a/.github/workflows/reusable-pre-commit.yml
+++ b/.github/workflows/reusable-pre-commit.yml
@@ -26,11 +26,6 @@ env:
 jobs:
   pre-commit:
     runs-on: ubuntu-latest
-    if: >
-      (github.event.pull_request.draft == false &&
-       !contains(github.event.pull_request.labels.*.name, 'ci/skip') &&
-       !contains(github.event.pull_request.head.ref, 'datadog-api-spec/test/')) ||
-      github.event_name == 'schedule'
     steps:
       - name: Get GitHub App token
         id: get_token
diff --git a/.github/workflows/reusable-ruby-test.yml b/.github/workflows/reusable-ruby-test.yml
index 77c27046426..176a72420b7 100644
--- a/.github/workflows/reusable-ruby-test.yml
+++ b/.github/workflows/reusable-ruby-test.yml
@@ -43,7 +43,6 @@ jobs:
         ruby-version: ${{ fromJSON(inputs.ruby-versions) }}
         platform: ${{ fromJSON(inputs.platforms) }}
     runs-on: ${{ matrix.platform }}
-    if: (github.event.pull_request.draft == false && !contains(github.event.pull_request.labels.*.name, 'ci/skip') && !contains(github.event.pull_request.head.ref, 'datadog-api-spec/test/')) || github.event_name == 'schedule'
     env:
       BUNDLE_WITHOUT: docs
       DD_PROFILING_NO_EXTENSION: true