Skip to content

Commit 24099eb

Browse files
fix(ci): build-test-runner if condition (#24224)
* fix(ci): build-test-runner if condition * Fix indentation * Debug with pull_request * Require build-test-runner success before running tests * Revert "Debug with pull_request" This reverts commit 659d7e5.
1 parent 78a8a8b commit 24099eb

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

.github/workflows/integration.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@ jobs:
4646

4747
build-test-runner:
4848
needs: changes
49-
if: |
50-
${{
51-
github.event_name == 'workflow_dispatch' ||
52-
(github.event_name == 'merge_group' &&
53-
(needs.changes.outputs.dependencies == 'true' ||
54-
needs.changes.outputs.integration-yml == 'true' ||
55-
needs.changes.outputs.int-tests-any == 'true' ||
56-
needs.changes.outputs.e2e-tests-any == 'true'))
57-
}}
49+
if: ${{
50+
github.event_name == 'workflow_dispatch' ||
51+
(github.event_name == 'merge_group' &&
52+
(needs.changes.outputs.dependencies == 'true' ||
53+
needs.changes.outputs.integration-yml == 'true' ||
54+
needs.changes.outputs.int-tests-any == 'true' ||
55+
needs.changes.outputs.e2e-tests-any == 'true'))
56+
}}
57+
5858
uses: ./.github/workflows/build-test-runner.yml
5959
with:
6060
commit_sha: ${{ github.sha }}
@@ -65,7 +65,7 @@ jobs:
6565
- changes
6666
- build-test-runner
6767

68-
if: ${{ !failure() && !cancelled() && (github.event_name == 'merge_group' || github.event_name == 'workflow_dispatch') }}
68+
if: ${{ !failure() && !cancelled() && needs.build-test-runner.result == 'success' && (github.event_name == 'merge_group' || github.event_name == 'workflow_dispatch') }}
6969
strategy:
7070
matrix:
7171
# TODO: Add "splunk" back once https://github.com/vectordotdev/vector/issues/23474 is fixed.
@@ -133,7 +133,7 @@ jobs:
133133
needs:
134134
- changes
135135
- build-test-runner
136-
if: ${{ !failure() && !cancelled() && (github.event_name == 'merge_group' || github.event_name == 'workflow_dispatch') }}
136+
if: ${{ !failure() && !cancelled() && needs.build-test-runner.result == 'success' && (github.event_name == 'merge_group' || github.event_name == 'workflow_dispatch') }}
137137
strategy:
138138
matrix:
139139
service: [ "datadog-logs", "datadog-metrics", "opentelemetry-logs", "opentelemetry-metrics" ]

0 commit comments

Comments
 (0)