Skip to content

Commit 73cf951

Browse files
committed
Merge branch 'master' into test
2 parents 4d850be + 02837f0 commit 73cf951

File tree

1 file changed

+16
-15
lines changed

1 file changed

+16
-15
lines changed

.github/scripts/set_push_chunks.sh

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@ elif [[ $LIB_CHANGED == 'true' ]]; then
99
echo "Libraries changed. Building only affected sketches."
1010
if [[ $NETWORKING_CHANGED == 'true' ]]; then
1111
echo "Networking libraries changed. Building networking related sketches."
12-
networking_sketches=$(find libraries/WiFi -name *.ino -printf '%f ')
13-
networking_sketches+="$(find libraries/Ethernet -name *.ino -printf '%f ')"
14-
networking_sketches+="$(find libraries/PPP -name *.ino -printf '%f ')"
15-
networking_sketches+="$(find libraries/NetworkClientSecure -name *.ino -printf '%f ')"
16-
networking_sketches+="$(find libraries/WebServer -name *.ino -printf '%f ')"
12+
networking_sketches="$(find libraries/WiFi -name *.ino) "
13+
networking_sketches+="$(find libraries/Ethernet -name *.ino) "
14+
networking_sketches+="$(find libraries/PPP -name *.ino) "
15+
networking_sketches+="$(find libraries/NetworkClientSecure -name *.ino) "
16+
networking_sketches+="$(find libraries/WebServer -name *.ino) "
1717
fi
1818
if [[ $FS_CHANGED == 'true' ]]; then
1919
echo "FS libraries changed. Building FS related sketches."
20-
fs_sketches=$(find libraries/SD -name *.ino -printf '%f ')
21-
fs_sketches+="$(find libraries/SD_MMC -name *.ino -printf '%f ')"
22-
fs_sketches+="$(find libraries/SPIFFS -name *.ino -printf '%f ')"
23-
fs_sketches+="$(find libraries/LittleFS -name *.ino -printf '%f ')"
24-
fs_sketches+="$(find libraries/FFat -name *.ino -printf '%f ')"
20+
fs_sketches="$(find libraries/SD -name *.ino) "
21+
fs_sketches+="$(find libraries/SD_MMC -name *.ino) "
22+
fs_sketches+="$(find libraries/SPIFFS -name *.ino) "
23+
fs_sketches+="$(find libraries/LittleFS -name *.ino) "
24+
fs_sketches+="$(find libraries/FFat -name *.ino) "
2525
fi
2626
sketches="$networking_sketches $fs_sketches"
2727
for file in $LIB_FILES; do
@@ -34,15 +34,15 @@ elif [[ $LIB_CHANGED == 'true' ]]; then
3434
echo "Library src file found: $file"
3535
lib=$(dirname $(dirname $file))
3636
if [[ -d $lib/examples ]]; then
37-
lib_sketches=$(find $lib/examples -name *.ino -printf '%f ')
38-
sketches+="$lib_sketches"
37+
lib_sketches=$(find $lib/examples -name *.ino)
38+
sketches+="$lib_sketches "
3939
echo "Library sketches: $lib_sketches"
4040
fi
4141
else
4242
# If file is in a example folder but it is not a sketch, find all sketches in the current directory
4343
echo "File in example folder found: $file"
44-
sketch=$(find $(dirname $file) -name *.ino -printf '%f ')
45-
sketches+="$sketch"
44+
sketch=$(find $(dirname $file) -name *.ino)
45+
sketches+="$sketch "
4646
echo "Sketch in example folder: $sketch"
4747
fi
4848
echo ""
@@ -57,7 +57,8 @@ if [[ -n $sketches ]]; then
5757
chunks_count=$((chunks_count+1))
5858
done
5959
echo "Number of sketches found: $chunks_count"
60-
echo "Sketches: $sketches"
60+
echo "Sketches:"
61+
echo "$sketches"
6162

6263
if [[ $chunks_count -gt $MAX_CHUNKS ]]; then
6364
echo "More sketches than the allowed number of chunks found. Limiting to $MAX_CHUNKS chunks."

0 commit comments

Comments
 (0)