Skip to content

Commit f409f32

Browse files
committed
Merge branch 'ci/default_partition' into test/psram
2 parents 2be9eec + 74e0c10 commit f409f32

File tree

2 files changed

+4
-11
lines changed

2 files changed

+4
-11
lines changed

.github/scripts/sketch_utils.sh

+3-10
Original file line numberDiff line numberDiff line change
@@ -287,8 +287,8 @@ function build_sketch(){ # build_sketch <ide_path> <user_path> <path-to-ino> [ex
287287
function count_sketches(){ # count_sketches <path> [target] [file] [ignore-requirements]
288288
local path=$1
289289
local target=$2
290-
local file=$3
291-
local ignore_requirements=$4
290+
local ignore_requirements=$3
291+
local file=$4
292292

293293
if [ $# -lt 1 ]; then
294294
echo "ERROR: Illegal number of parameters"
@@ -321,13 +321,6 @@ function count_sketches(){ # count_sketches <path> [target] [file] [ignore-requi
321321
continue
322322
fi
323323

324-
echo "Args: $#"
325-
echo "1: $1"
326-
echo "2: $2"
327-
echo "3: $3"
328-
echo "4: $4"
329-
echo "ignore_requirements: $ignore_requirements"
330-
331324
if [ "$ignore_requirements" != "1" ]; then
332325
echo "Checking requirements"
333326
# Check if the sketch requires any configuration options
@@ -418,7 +411,7 @@ function build_sketches(){ # build_sketches <ide_path> <user_path> <target> <pat
418411

419412
set +e
420413
if [ -n "$sketches_file" ]; then
421-
count_sketches "$path" "$target" "$sketches_file"
414+
count_sketches "$path" "$target" "0" "$sketches_file"
422415
local sketchcount=$?
423416
else
424417
count_sketches "$path" "$target"

.github/scripts/tests_run.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ else
230230

231231
set +e
232232
# Ignore requirements as we don't have the libs. The requirements will be checked in the run_test function
233-
${COUNT_SKETCHES} "$test_folder" "$target" "" "1"
233+
${COUNT_SKETCHES} "$test_folder" "$target" "1"
234234
sketchcount=$?
235235
set -e
236236
sketches=$(cat sketches.txt)

0 commit comments

Comments
 (0)