Skip to content

Commit 9bd7d06

Browse files
committed
Restore CI
1 parent 6a5c4ac commit 9bd7d06

File tree

1 file changed

+9
-22
lines changed

1 file changed

+9
-22
lines changed

.github/workflows/ci.yaml

Lines changed: 9 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -143,22 +143,15 @@ jobs:
143143
tests="[]"
144144
tests_glob=""
145145
skip_coverage=""
146-
integration_changes=${{ steps.integrations.outputs.changes }}
147146
148-
force_single_integration="gardena_bluetooth"
149-
if [[ "${force_single_integration}" != "" ]];
150-
then
151-
integration_changes="[\"${force_single_integration}\"]"
152-
fi
153-
154-
if [[ "${integration_changes}" != "[]" ]];
147+
if [[ "${{ steps.integrations.outputs.changes }}" != "[]" ]];
155148
then
156149
# Create a file glob for the integrations
157-
integrations_glob=$(echo "${integration_changes}" | jq -cSr '. | join(",")')
150+
integrations_glob=$(echo '${{ steps.integrations.outputs.changes }}' | jq -cSr '. | join(",")')
158151
[[ "${integrations_glob}" == *","* ]] && integrations_glob="{${integrations_glob}}"
159152
160153
# Create list of testable integrations
161-
possible_integrations=$(echo "${integration_changes}" | jq -cSr '.[]')
154+
possible_integrations=$(echo '${{ steps.integrations.outputs.changes }}' | jq -cSr '.[]')
162155
tests=$(
163156
for integration in ${possible_integrations};
164157
do
@@ -185,14 +178,12 @@ jobs:
185178
186179
# We need to run the full suite on certain branches.
187180
# Or, in case core files are touched, for the full suite as well.
188-
if [[ "${force_single_integration}" == "" ]] \
189-
&& ([[ "${{ github.ref }}" == "refs/heads/dev" ]] \
190-
|| [[ "${{ github.ref }}" == "refs/heads/master" ]] \
191-
|| [[ "${{ github.ref }}" == "refs/heads/rc" ]] \
192-
|| [[ "${{ steps.core.outputs.any }}" == "true" ]] \
193-
|| [[ "${{ github.event.inputs.full }}" == "true" ]] \
194-
|| [[ "${{ contains(github.event.pull_request.labels.*.name, 'ci-full-run') }}" == "true" ]]
195-
);
181+
if [[ "${{ github.ref }}" == "refs/heads/dev" ]] \
182+
|| [[ "${{ github.ref }}" == "refs/heads/master" ]] \
183+
|| [[ "${{ github.ref }}" == "refs/heads/rc" ]] \
184+
|| [[ "${{ steps.core.outputs.any }}" == "true" ]] \
185+
|| [[ "${{ github.event.inputs.full }}" == "true" ]] \
186+
|| [[ "${{ contains(github.event.pull_request.labels.*.name, 'ci-full-run') }}" == "true" ]];
196187
then
197188
mariadb_groups=${MARIADB_VERSIONS}
198189
postgresql_groups=${POSTGRESQL_VERSIONS}
@@ -954,7 +945,6 @@ jobs:
954945
--timeout=9 \
955946
--durations=10 \
956947
--numprocesses auto \
957-
--snapshot-details \
958948
--dist=loadfile \
959949
${cov_params[@]} \
960950
-o console_output_style=count \
@@ -1077,7 +1067,6 @@ jobs:
10771067
-qq \
10781068
--timeout=20 \
10791069
--numprocesses 1 \
1080-
--snapshot-details \
10811070
${cov_params[@]} \
10821071
-o console_output_style=count \
10831072
--durations=10 \
@@ -1204,7 +1193,6 @@ jobs:
12041193
-qq \
12051194
--timeout=9 \
12061195
--numprocesses 1 \
1207-
--snapshot-details \
12081196
${cov_params[@]} \
12091197
-o console_output_style=count \
12101198
--durations=0 \
@@ -1351,7 +1339,6 @@ jobs:
13511339
-qq \
13521340
--timeout=9 \
13531341
--numprocesses auto \
1354-
--snapshot-details \
13551342
${cov_params[@]} \
13561343
-o console_output_style=count \
13571344
--durations=0 \

0 commit comments

Comments
 (0)