From 88712692b5971769380e9ed8b472d95af67971c1 Mon Sep 17 00:00:00 2001 From: Ulysse Mavrocordatos Date: Wed, 24 Sep 2025 15:44:07 +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 4d066138f7e..0a7df7e896a 100644 --- a/.github/workflows/reusable-integration-test.yml +++ b/.github/workflows/reusable-integration-test.yml @@ -58,7 +58,7 @@ on: required: false concurrency: - group: integration-${{ github.head_ref }} + group: integration-java-${{ inputs.target-branch || github.head_ref }} cancel-in-progress: true jobs: From 1850425873a109c9b75a3a71bbace5febf35216d Mon Sep 17 00:00:00 2001 From: Ulysse Mavrocordatos Date: Thu, 25 Sep 2025 10:14:30 +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 | 1 - .github/workflows/reusable-java-test.yml | 1 - .github/workflows/reusable-javadoc.yml | 1 - .github/workflows/reusable-pre-commit.yml | 5 ----- .github/workflows/reusable-shading.yml | 1 - 5 files changed, 9 deletions(-) diff --git a/.github/workflows/reusable-examples.yml b/.github/workflows/reusable-examples.yml index 0edefa7febe..368a8062cfd 100644 --- a/.github/workflows/reusable-examples.yml +++ b/.github/workflows/reusable-examples.yml @@ -27,7 +27,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' steps: - uses: actions/checkout@v3 with: diff --git a/.github/workflows/reusable-java-test.yml b/.github/workflows/reusable-java-test.yml index f2bb06e5523..1dab2dc65b4 100644 --- a/.github/workflows/reusable-java-test.yml +++ b/.github/workflows/reusable-java-test.yml @@ -38,7 +38,6 @@ jobs: java-version: ${{ fromJSON(inputs.java-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' steps: - name: Checkout code uses: actions/checkout@v3 diff --git a/.github/workflows/reusable-javadoc.yml b/.github/workflows/reusable-javadoc.yml index 21fe7690a8f..00393d09c50 100644 --- a/.github/workflows/reusable-javadoc.yml +++ b/.github/workflows/reusable-javadoc.yml @@ -22,7 +22,6 @@ on: jobs: javadoc: 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: - uses: actions/checkout@v3 with: diff --git a/.github/workflows/reusable-pre-commit.yml b/.github/workflows/reusable-pre-commit.yml index 60340038a09..058ccd6afe3 100644 --- a/.github/workflows/reusable-pre-commit.yml +++ b/.github/workflows/reusable-pre-commit.yml @@ -22,11 +22,6 @@ on: 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 if: inputs.enable-commit-changes && github.event.pull_request.head.repo.full_name == github.repository diff --git a/.github/workflows/reusable-shading.yml b/.github/workflows/reusable-shading.yml index eac1e6eef8a..0fe58354382 100644 --- a/.github/workflows/reusable-shading.yml +++ b/.github/workflows/reusable-shading.yml @@ -22,7 +22,6 @@ on: jobs: shading: 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: - uses: actions/checkout@v3 with: