Skip to content

Commit 53f7e7c

Browse files
committed
Merge branch 'ci/fixes'
2 parents 0ec6b72 + 0b6d5b7 commit 53f7e7c

File tree

2 files changed

+9
-14
lines changed

2 files changed

+9
-14
lines changed

.github/scripts/tests_matrix.sh

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@
33
# QEMU is disabled for now
44
qemu_enabled="false"
55

6-
build_types="'validation'"
7-
hw_types="'validation'"
8-
wokwi_types="'validation'"
9-
qemu_types="'validation'"
10-
116
build_types='"validation"'
127
hw_types='"validation"'
138
wokwi_types='"validation"'
@@ -20,9 +15,9 @@ if [[ $IS_PR != 'true' ]] || [[ $PERFORMANCE_ENABLED == 'true' ]]; then
2015
#qemu_types+=',"performance"'
2116
fi
2217

23-
hw_targets="'esp32','esp32s2','esp32s3','esp32c3','esp32c5','esp32c6','esp32h2','esp32p4'"
24-
wokwi_targets="'esp32','esp32s2','esp32s3','esp32c3','esp32c6','esp32h2','esp32p4'"
25-
qemu_targets="'esp32','esp32c3'"
18+
hw_targets='"esp32","esp32s2","esp32s3","esp32c3","esp32c5","esp32c6","esp32h2","esp32p4"'
19+
wokwi_targets='"esp32","esp32s2","esp32s3","esp32c3","esp32c6","esp32h2","esp32p4"'
20+
qemu_targets='"esp32","esp32c3"'
2621

2722
# The build targets should be the sum of the hw, wokwi and qemu targets without duplicates
2823
build_targets=$(echo "$hw_targets,$wokwi_targets,$qemu_targets" | tr ',' '\n' | sort -u | tr '\n' ',' | sed 's/,$//')

.github/workflows/tests_hw_wokwi.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -123,13 +123,13 @@ jobs:
123123
push_time=""
124124
fi
125125
126-
hw_targets=$(jq -r '.hw_targets | tostring' artifacts/matrix_info/test_matrix.json | tr -cd "[:alnum:],[]'")
127-
hw_types=$(jq -r '.hw_types | tostring' artifacts/matrix_info/test_matrix.json | tr -cd "[:alpha:],[]'")
128-
wokwi_targets=$(jq -r '.wokwi_targets | tostring' artifacts/matrix_info/test_matrix.json | tr -cd "[:alnum:],[]'")
129-
wokwi_types=$(jq -r '.wokwi_types | tostring' artifacts/matrix_info/test_matrix.json | tr -cd "[:alpha:],[]'")
126+
hw_targets=$(jq -r '.hw_targets | tostring' artifacts/matrix_info/test_matrix.json | tr -cd "[:alnum:],[]\"")
127+
hw_types=$(jq -r '.hw_types | tostring' artifacts/matrix_info/test_matrix.json | tr -cd "[:alpha:],[]\"")
128+
wokwi_targets=$(jq -r '.wokwi_targets | tostring' artifacts/matrix_info/test_matrix.json | tr -cd "[:alnum:],[]\"")
129+
wokwi_types=$(jq -r '.wokwi_types | tostring' artifacts/matrix_info/test_matrix.json | tr -cd "[:alpha:],[]\"")
130130
qemu_tests_enabled=$(jq -r '.qemu_tests_enabled' artifacts/matrix_info/test_matrix.json | tr -cd "[:alpha:]")
131-
qemu_targets=$(jq -r '.qemu_targets | tostring' artifacts/matrix_info/test_matrix.json | tr -cd "[:alnum:],[]'")
132-
qemu_types=$(jq -r '.qemu_types | tostring' artifacts/matrix_info/test_matrix.json | tr -cd "[:alpha:],[]'")
131+
qemu_targets=$(jq -r '.qemu_targets | tostring' artifacts/matrix_info/test_matrix.json | tr -cd "[:alnum:],[]\"")
132+
qemu_types=$(jq -r '.qemu_types | tostring' artifacts/matrix_info/test_matrix.json | tr -cd "[:alpha:],[]\"")
133133
134134
echo "base = $base"
135135
echo "hw_targets = $hw_targets"

0 commit comments

Comments
 (0)