Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 087ebe0

Browse filesBrowse files
P-R-O-C-H-YP-R-O-C-H-Y
authored
CI HW Testing Update (espressif#7911)
* Update upload-artifact action to v3 * Fix deprecated set-output * updated path + error if no files found * update path * update path + debug ls * dbg path print * dbg path remove +added echo with buildpath * change build_dir * fix upload-artifact paths * changed build_dirs * move sketchname variable * Update touch pressed value * Run one test only for faster debuging * Revert "Run one test only for faster debuging" This reverts commit e2bf6a8. * fix value
1 parent 30ab1c3 commit 087ebe0
Copy full SHA for 087ebe0

File tree

Expand file treeCollapse file tree

4 files changed

+19
-16
lines changed
Filter options
Expand file treeCollapse file tree

4 files changed

+19
-16
lines changed

‎.github/scripts/sketch_utils.sh

Copy file name to clipboardExpand all lines: .github/scripts/sketch_utils.sh
+5-3Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,26 +117,27 @@ function build_sketch(){ # build_sketch <ide_path> <user_path> <path-to-ino> [ex
117117
# 3. Created at the sketch level as "buildX" where X is the number
118118
# of configuration built in case of a multiconfiguration test.
119119

120+
sketchname=$(basename $sketchdir)
121+
120122
ARDUINO_CACHE_DIR="$HOME/.arduino/cache.tmp"
121123
if [ -n "$ARDUINO_BUILD_DIR" ]; then
122124
build_dir="$ARDUINO_BUILD_DIR"
123125
elif [ $len -eq 1 ]; then
124126
# build_dir="$sketchdir/build"
125-
build_dir="$HOME/.arduino/build.tmp"
127+
build_dir="$HOME/.arduino/tests/$sketchname/build.tmp"
126128
fi
127129

128130
mkdir -p "$ARDUINO_CACHE_DIR"
129131
for i in `seq 0 $(($len - 1))`
130132
do
131133
if [ $len -ne 1 ]; then
132134
# build_dir="$sketchdir/build$i"
133-
build_dir="$HOME/.arduino/build$i.tmp"
135+
build_dir="$HOME/.arduino/tests/$sketchname/build$i.tmp"
134136
fi
135137
rm -rf $build_dir
136138
mkdir -p $build_dir
137139

138140
currfqbn=`echo $fqbn | jq -r --argjson i $i '.[$i]'`
139-
sketchname=$(basename $sketchdir)
140141

141142
if [ -f "$ide_path/arduino-cli" ]; then
142143
echo "Building $sketchname with arduino-cli and FQBN=$currfqbn"
@@ -152,6 +153,7 @@ function build_sketch(){ # build_sketch <ide_path> <user_path> <path-to-ino> [ex
152153
$xtra_opts "${sketchdir}"
153154
elif [ -f "$ide_path/arduino-builder" ]; then
154155
echo "Building $sketchname with arduino-builder and FQBN=$currfqbn"
156+
echo "Build path = $build_dir"
155157

156158
$ide_path/arduino-builder -compile -logger=human -core-api-version=10810 \
157159
-fqbn=\"$currfqbn\" \

‎.github/scripts/tests_run.sh

Copy file name to clipboardExpand all lines: .github/scripts/tests_run.sh
+4-2Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ function run_test() {
1515
fi
1616

1717
if [ $len -eq 1 ]; then
18-
build_dir="tests/$sketchname/build"
18+
# build_dir="tests/$sketchname/build"
19+
build_dir="$HOME/.arduino/tests/$sketchname/build.tmp"
1920
report_file="tests/$sketchname/$sketchname.xml"
2021
fi
2122

@@ -27,7 +28,8 @@ function run_test() {
2728
fi
2829

2930
if [ $len -ne 1 ]; then
30-
build_dir="tests/$sketchname/build$i"
31+
# build_dir="tests/$sketchname/build$i"
32+
build_dir="$HOME/.arduino/tests/$sketchname/build$i.tmp"
3133
report_file="tests/$sketchname/$sketchname$i.xml"
3234
fi
3335

‎.github/workflows/hil.yml

Copy file name to clipboardExpand all lines: .github/workflows/hil.yml
+9-10Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
set -e
4040
rm sketches.txt
4141
CHUNKS=$(jq -c -n '$ARGS.positional' --args `seq 0 1 $((sketches - 1))`)
42-
echo "::set-output name=chunks::${CHUNKS}"
42+
echo "chunks=${CHUNKS}" >>$GITHUB_OUTPUT
4343
4444
Build:
4545
needs: gen_chunks
@@ -49,21 +49,20 @@ jobs:
4949
matrix:
5050
chip: ['esp32', 'esp32s2', 'esp32s3', 'esp32c3']
5151
chunks: ${{fromJson(needs.gen_chunks.outputs.chunks)}}
52-
5352
steps:
5453
- name: Checkout Repository
5554
uses: actions/checkout@v3
56-
5755
- name: Build sketches
5856
run: |
5957
bash .github/scripts/tests_build.sh -c -t ${{matrix.chip}} -i ${{matrix.chunks}} -m ${{env.MAX_CHUNKS}}
6058
- name: Upload ${{matrix.chip}}-${{matrix.chunks}} artifacts
61-
uses: actions/upload-artifact@v2
59+
uses: actions/upload-artifact@v3
6260
with:
6361
name: ${{matrix.chip}}-${{matrix.chunks}}.artifacts
6462
path: |
65-
tests/*/build*/*.bin
66-
tests/*/build*/*.json
63+
~/.arduino/tests/*/build*.tmp/*.bin
64+
~/.arduino/tests/*/build*.tmp/*.json
65+
if-no-files-found: error
6766
Test:
6867
needs: [gen_chunks, Build]
6968
name: ${{matrix.chip}}-Test#${{matrix.chunks}}
@@ -87,10 +86,10 @@ jobs:
8786
uses: actions/checkout@v3
8887

8988
- name: Download ${{matrix.chip}}-${{matrix.chunks}} artifacts
90-
uses: actions/download-artifact@v2
89+
uses: actions/download-artifact@v3
9190
with:
9291
name: ${{matrix.chip}}-${{matrix.chunks}}.artifacts
93-
path: tests/
92+
path: ~/.arduino/tests/
9493

9594
- name: Install dependencies
9695
run: |
@@ -103,7 +102,7 @@ jobs:
103102
bash .github/scripts/tests_run.sh -c -t ${{matrix.chip}} -i ${{matrix.chunks}} -m ${{env.MAX_CHUNKS}} -e
104103
105104
- name: Upload test result artifacts
106-
uses: actions/upload-artifact@v2
105+
uses: actions/upload-artifact@v3
107106
if: always()
108107
with:
109108
name: test_results-${{matrix.chip}}-${{matrix.chunks}}
@@ -118,7 +117,7 @@ jobs:
118117
runs-on: ubuntu-latest
119118
steps:
120119
- name: Upload
121-
uses: actions/upload-artifact@v2
120+
uses: actions/upload-artifact@v3
122121
with:
123122
name: Event File
124123
path: ${{github.event_path}}

‎tests/touch/touch.ino

Copy file name to clipboardExpand all lines: tests/touch/touch.ino
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ uint8_t TOUCH_GPIOS[] = {1,2,3,4,5,6,7,8,9,10,11,12/*,13,14*/};
5959
#define INTERRUPT_THRESHOLD 30000
6060
#elif CONFIG_IDF_TARGET_ESP32S3
6161
#define RELEASED_VALUE 25000 //25000- read value to pass test
62-
#define PRESSED_VALUE 100000 //150000+ read value to pass test
62+
#define PRESSED_VALUE 90000 //90000+ read value to pass test
6363
#define INTERRUPT_THRESHOLD 80000
6464
#else
6565
#error Test not currently supported on this chip. Please adjust and try again!

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.