Skip to content

Commit 09ae24e

Browse files
committed
fix(ci): Fix paths for sdkconfig
1 parent 9d92b6d commit 09ae24e

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

Diff for: .github/scripts/install-platformio-esp32.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ PLATFORMIO_ESP32_URL="https://github.com/platformio/platform-espressif32.git"
66
TOOLCHAIN_VERSION="12.2.0+20230208"
77
ESPTOOLPY_VERSION="~1.40501.0"
88
ESPRESSIF_ORGANIZATION_NAME="espressif"
9-
LIBS_DIR="tools/esp32-arduino-libs"
9+
LIBS_DIR="$PLATFORMIO_ESP32_PATH/tools/esp32-arduino-libs"
1010

1111
echo "Installing Python Wheel ..."
1212
pip install wheel > /dev/null 2>&1
@@ -100,7 +100,7 @@ function count_sketches(){ # count_sketches <examples-path>
100100
requirements=$(jq -r '.requires[]? // empty' $sketchdir/ci.json)
101101
if [[ "$requirements" != "null" ]] || [[ "$requirements" != "" ]]; then
102102
for requirement in $requirements; do
103-
found_line=$(grep -E "^$requirement" $LIBS_DIR/esp32/sdkconfig)
103+
found_line=$(grep -E "^$requirement" "$LIBS_DIR/esp32/sdkconfig")
104104
if [[ "$found_line" == "" ]]; then
105105
continue 2
106106
fi
@@ -190,7 +190,7 @@ function build_pio_sketches(){ # build_pio_sketches <board> <options> <examples-
190190
requirements=$(jq -r '.requires[]? // empty' $sketchdir/ci.json)
191191
if [[ "$requirements" != "null" ]] || [[ "$requirements" != "" ]]; then
192192
for requirement in $requirements; do
193-
found_line=$(grep -E "^$requirement" $LIBS_DIR/esp32/sdkconfig)
193+
found_line=$(grep -E "^$requirement" "$LIBS_DIR/esp32/sdkconfig")
194194
if [[ "$found_line" == "" ]]; then
195195
continue 2
196196
fi

Diff for: .github/scripts/sketch_utils.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
LIBS_DIR="tools/esp32-arduino-libs"
3+
LIBS_DIR="$ARDUINO_ESP32_PATH/tools/esp32-arduino-libs"
44

55
function build_sketch(){ # build_sketch <ide_path> <user_path> <path-to-ino> [extra-options]
66
while [ ! -z "$1" ]; do
@@ -154,7 +154,7 @@ function build_sketch(){ # build_sketch <ide_path> <user_path> <path-to-ino> [ex
154154
requirements=$(jq -r '.requires[]? // empty' $sketchdir/ci.json)
155155
if [[ "$requirements" != "null" ]] || [[ "$requirements" != "" ]]; then
156156
for requirement in $requirements; do
157-
found_line=$(grep -E "^$requirement" $LIBS_DIR/$target/sdkconfig)
157+
found_line=$(grep -E "^$requirement" "$LIBS_DIR/$target/sdkconfig")
158158
if [[ "$found_line" == "" ]]; then
159159
echo "Target $target does not meet the requirement $requirement for $sketchname. Skipping."
160160
exit 0

Diff for: .github/scripts/tests_run.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ function run_test() {
2525
requirements=$(jq -r '.requires[]? // empty' $sketchdir/ci.json)
2626
if [[ "$requirements" != "null" ]] || [[ "$requirements" != "" ]]; then
2727
for requirement in $requirements; do
28-
found_line=$(grep -E "^$requirement" $LIBS_DIR/$target/sdkconfig)
28+
found_line=$(grep -E "^$requirement" "$LIBS_DIR/$target/sdkconfig")
2929
if [[ "$found_line" == "" ]]; then
3030
printf "\033[93mTarget $target does not meet the requirement $requirement for $sketchname. Skipping.\033[0m\n"
3131
printf "\n\n\n"
@@ -120,7 +120,7 @@ function run_test() {
120120

121121
SCRIPTS_DIR="./.github/scripts"
122122
COUNT_SKETCHES="${SCRIPTS_DIR}/sketch_utils.sh count"
123-
LIBS_DIR="tools/esp32-arduino-libs"
123+
LIBS_DIR="$ARDUINO_ESP32_PATH/tools/esp32-arduino-libs"
124124

125125
platform="hardware"
126126
wokwi_timeout=60000

0 commit comments

Comments
 (0)