Skip to content

Commit da3e469

Browse files
authored
fix: remove duplicate conditional logic from reusable workflows and fix integration concurrency group (#2839)
- Remove duplicate conditions from reusable workflows that don't work properly in workflow_call context since github.event.pull_request is not available - Fix integration test concurrency group to be client-specific - The main test.yml workflow already handles these conditions correctly
1 parent c4fbef2 commit da3e469

File tree

4 files changed

+1
-8
lines changed

4 files changed

+1
-8
lines changed

.github/workflows/reusable-examples.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ on:
2727
jobs:
2828
examples:
2929
runs-on: ubuntu-latest
30-
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'
3130
steps:
3231
- uses: actions/checkout@v3
3332
with:

.github/workflows/reusable-integration-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ on:
5858
required: false
5959

6060
concurrency:
61-
group: integration-${{ github.head_ref }}
61+
group: integration-typescript-${{ inputs.target-branch || github.head_ref }}
6262
cancel-in-progress: true
6363

6464
jobs:

.github/workflows/reusable-pre-commit.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,6 @@ on:
2222
jobs:
2323
pre-commit:
2424
runs-on: ubuntu-latest
25-
if: >
26-
(github.event.pull_request.draft == false &&
27-
!contains(github.event.pull_request.labels.*.name, 'ci/skip') &&
28-
!contains(github.event.pull_request.head.ref, 'datadog-api-spec/test/')) ||
29-
github.event_name == 'schedule'
3025
steps:
3126
- name: Get GitHub App token
3227
if: inputs.enable-commit-changes && github.event.pull_request.head.repo.full_name == github.repository

.github/workflows/reusable-typescript-test.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ jobs:
3636
node-version: ${{ fromJSON(inputs.node-versions) }}
3737
platform: ${{ fromJSON(inputs.platforms) }}
3838
runs-on: ${{ matrix.platform }}
39-
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'
4039
steps:
4140
- uses: actions/checkout@v3
4241
with:

0 commit comments

Comments
 (0)