Skip to content

Commit 9581b35

Browse files
authored
chore(ci): save time int test workflow merge queue (#17869)
This change removes running the `changes` job when the workflow is triggered in the merge queue, as that is not needed.
1 parent 8519cb1 commit 9581b35

File tree

1 file changed

+34
-32
lines changed

1 file changed

+34
-32
lines changed

.github/workflows/integration.yml

+34-32
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ env:
3737
jobs:
3838

3939
changes:
40+
if: github.event_name == 'pull_request'
4041
uses: ./.github/workflows/changes.yml
4142
with:
4243
base_ref: ${{ github.event.pull_request.base.ref }}
@@ -49,39 +50,40 @@ jobs:
4950
name: Integration Tests
5051
runs-on: [linux, ubuntu-20.04-4core]
5152
needs: changes
52-
if: |
53+
if: always() && (
5354
github.event_name == 'merge_group' || (
54-
needs.changes.outputs.all-int == 'true'
55-
|| needs.changes.outputs.amqp == 'true'
56-
|| needs.changes.outputs.appsignal == 'true'
57-
|| needs.changes.outputs.aws == 'true'
58-
|| needs.changes.outputs.axiom == 'true'
59-
|| needs.changes.outputs.azure == 'true'
60-
|| needs.changes.outputs.clickhouse == 'true'
61-
|| needs.changes.outputs.databend == 'true'
62-
|| needs.changes.outputs.datadog == 'true'
63-
|| needs.changes.outputs.dnstap == 'true'
64-
|| needs.changes.outputs.docker-logs == 'true'
65-
|| needs.changes.outputs.elasticsearch == 'true'
66-
|| needs.changes.outputs.eventstoredb == 'true'
67-
|| needs.changes.outputs.fluent == 'true'
68-
|| needs.changes.outputs.gcp == 'true'
69-
|| needs.changes.outputs.humio == 'true'
70-
|| needs.changes.outputs.http-client == 'true'
71-
|| needs.changes.outputs.influxdb == 'true'
72-
|| needs.changes.outputs.kafka == 'true'
73-
|| needs.changes.outputs.logstash == 'true'
74-
|| needs.changes.outputs.loki == 'true'
75-
|| needs.changes.outputs.mongodb == 'true'
76-
|| needs.changes.outputs.nats == 'true'
77-
|| needs.changes.outputs.nginx == 'true'
78-
|| needs.changes.outputs.opentelemetry == 'true'
79-
|| needs.changes.outputs.postgres == 'true'
80-
|| needs.changes.outputs.prometheus == 'true'
81-
|| needs.changes.outputs.pulsar == 'true'
82-
|| needs.changes.outputs.redis == 'true'
83-
|| needs.changes.outputs.splunk == 'true'
84-
|| needs.changes.outputs.webhdfs == 'true'
55+
needs.changes.outputs.all-int == 'true'
56+
|| needs.changes.outputs.amqp == 'true'
57+
|| needs.changes.outputs.appsignal == 'true'
58+
|| needs.changes.outputs.aws == 'true'
59+
|| needs.changes.outputs.axiom == 'true'
60+
|| needs.changes.outputs.azure == 'true'
61+
|| needs.changes.outputs.clickhouse == 'true'
62+
|| needs.changes.outputs.databend == 'true'
63+
|| needs.changes.outputs.datadog == 'true'
64+
|| needs.changes.outputs.dnstap == 'true'
65+
|| needs.changes.outputs.docker-logs == 'true'
66+
|| needs.changes.outputs.elasticsearch == 'true'
67+
|| needs.changes.outputs.eventstoredb == 'true'
68+
|| needs.changes.outputs.fluent == 'true'
69+
|| needs.changes.outputs.gcp == 'true'
70+
|| needs.changes.outputs.humio == 'true'
71+
|| needs.changes.outputs.http-client == 'true'
72+
|| needs.changes.outputs.influxdb == 'true'
73+
|| needs.changes.outputs.kafka == 'true'
74+
|| needs.changes.outputs.logstash == 'true'
75+
|| needs.changes.outputs.loki == 'true'
76+
|| needs.changes.outputs.mongodb == 'true'
77+
|| needs.changes.outputs.nats == 'true'
78+
|| needs.changes.outputs.nginx == 'true'
79+
|| needs.changes.outputs.opentelemetry == 'true'
80+
|| needs.changes.outputs.postgres == 'true'
81+
|| needs.changes.outputs.prometheus == 'true'
82+
|| needs.changes.outputs.pulsar == 'true'
83+
|| needs.changes.outputs.redis == 'true'
84+
|| needs.changes.outputs.splunk == 'true'
85+
|| needs.changes.outputs.webhdfs == 'true'
86+
)
8587
)
8688
timeout-minutes: 75
8789
steps:

0 commit comments

Comments
 (0)