Skip to content

Commit 9de2836

Browse files
GOB52GOB52
committed
Merge branch 'develop'
2 parents 901e704 + c18c6ed commit 9de2836

21 files changed

Lines changed: 976 additions & 447 deletions

‎.github/workflows/arduino-esp-v2-build-check.yml‎

Lines changed: 33 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -12,28 +12,28 @@ on:
1212
branches:
1313
- '*'
1414
paths:
15-
- 'src/unit/**.cpp'
16-
- 'src/unit/**.hpp'
17-
- 'src/unit/**.h'
18-
- 'src/unit/**.c'
15+
- 'src/**.cpp'
16+
- 'src/**.hpp'
17+
- 'src/**.h'
18+
- 'src/**.c'
1919
- 'examples/UnitUnified/**.ino'
2020
- 'examples/UnitUnified/**.cpp'
2121
- 'examples/UnitUnified/**.hpp'
2222
- 'examples/UnitUnified/**.h'
2323
- 'examples/UnitUnified/**.c'
24-
- '**arduino-esp-v2-build-check.yml'
24+
- '.github/workflows/arduino-esp-v2-build-check.yml'
2525
pull_request:
2626
paths:
27-
- 'src/unit/**.cpp'
28-
- 'src/unit/**.hpp'
29-
- 'src/unit/**.h'
30-
- 'src/unit/**.c'
27+
- 'src/**.cpp'
28+
- 'src/**.hpp'
29+
- 'src/**.h'
30+
- 'src/**.c'
3131
- 'examples/UnitUnified/**.ino'
3232
- 'examples/UnitUnified/**.cpp'
3333
- 'examples/UnitUnified/**.hpp'
3434
- 'examples/UnitUnified/**.h'
3535
- 'examples/UnitUnified/**.c'
36-
- '**arduino-esp-v2-build-check.yml'
36+
- '.github/workflows/arduino-esp-v2-build-check.yml'
3737
workflow_dispatch:
3838

3939
defaults:
@@ -48,11 +48,11 @@ jobs:
4848
build:
4949
name: ${{ matrix.unit }}:${{ matrix.sketch }}:${{matrix.board}}@${{matrix.platform-version}}
5050
runs-on: ubuntu-latest
51-
timeout-minutes: 5
51+
timeout-minutes: 12
5252

5353
strategy:
5454
fail-fast: false
55-
#max-parallel: 1
55+
max-parallel: 20
5656
matrix:
5757
platform-url:
5858
- https://espressif.github.io/arduino-esp32/package_esp32_index.json
@@ -84,19 +84,27 @@ jobs:
8484
steps:
8585
- name: Checkout
8686
uses: actions/checkout@v4
87-
with:
88-
ref: ${{ github.event.pull_request.head.sha }}
8987

90-
# Build
88+
- name: Prepare libraries list
89+
id: libs
90+
run: |
91+
{
92+
echo "yaml<<EOF"
93+
echo "$REQUIRED_LIBRARIES" | tr ',' '\n' | while read -r lib; do
94+
echo "- name: $lib"
95+
done
96+
echo "- source-path: ./"
97+
echo "EOF"
98+
} >> "$GITHUB_OUTPUT"
99+
91100
- name: Compile examples
92-
uses: ArminJo/arduino-test-compile@master
101+
uses: arduino/compile-sketches@v1
93102
with:
94-
arduino-board-fqbn: ${{ matrix.platform }}:${{ matrix.archi }}:${{ matrix.board }}
95-
arduino-platform: ${{ matrix.platform }}:${{ matrix.archi }}@${{ matrix.platform-version }}
96-
platform-url: ${{ matrix.platform-url }}
97-
required-libraries: ${{ env.REQUIRED_LIBRARIES }}
98-
extra-arduino-cli-args: ${{ matrix.cli-args }}
99-
#build-properties: ${{ toJson(matrix.build-properties) }}
100-
sketch-names: ${{ matrix.sketch }}.ino
101-
sketch-names-find-start: ${{ env.SKETCH_NAMES_FIND_START }}/${{ matrix.unit }}
102-
#sketches-exclude: ${{ matrix.sketches-exclude }}
103+
fqbn: ${{ matrix.platform }}:${{ matrix.archi }}:${{ matrix.board }}
104+
platforms: |
105+
- name: ${{ matrix.platform }}:${{ matrix.archi }}
106+
source-url: ${{ matrix.platform-url }}
107+
version: ${{ matrix.platform-version }}
108+
libraries: ${{ steps.libs.outputs.yaml }}
109+
sketch-paths: |
110+
- ${{ env.SKETCH_NAMES_FIND_START }}/${{ matrix.unit }}/${{ matrix.sketch }}

‎.github/workflows/arduino-esp-v3-build-check.yml‎

Lines changed: 38 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -11,28 +11,28 @@ on:
1111
branches:
1212
- '*'
1313
paths:
14-
- 'src/unit/**.cpp'
15-
- 'src/unit/**.hpp'
16-
- 'src/unit/**.h'
17-
- 'src/unit/**.c'
14+
- 'src/**.cpp'
15+
- 'src/**.hpp'
16+
- 'src/**.h'
17+
- 'src/**.c'
1818
- 'examples/UnitUnified/**.ino'
1919
- 'examples/UnitUnified/**.cpp'
2020
- 'examples/UnitUnified/**.hpp'
2121
- 'examples/UnitUnified/**.h'
2222
- 'examples/UnitUnified/**.c'
23-
- '**arduino-esp-v3-build-check.yml'
23+
- '.github/workflows/arduino-esp-v3-build-check.yml'
2424
pull_request:
2525
paths:
26-
- 'src/unit/**.cpp'
27-
- 'src/unit/**.hpp'
28-
- 'src/unit/**.h'
29-
- 'src/unit/**.c'
26+
- 'src/**.cpp'
27+
- 'src/**.hpp'
28+
- 'src/**.h'
29+
- 'src/**.c'
3030
- 'examples/UnitUnified/**.ino'
3131
- 'examples/UnitUnified/**.cpp'
3232
- 'examples/UnitUnified/**.hpp'
3333
- 'examples/UnitUnified/**.h'
3434
- 'examples/UnitUnified/**.c'
35-
- '**arduino-esp-v3-build-check.yml'
35+
- '.github/workflows/arduino-esp-v3-build-check.yml'
3636
workflow_dispatch:
3737

3838
defaults:
@@ -47,11 +47,11 @@ jobs:
4747
build:
4848
name: ${{ matrix.unit }}:${{ matrix.sketch }}:${{matrix.board}}@${{matrix.platform-version}}
4949
runs-on: ubuntu-latest
50-
timeout-minutes: 5
50+
timeout-minutes: 12
5151

5252
strategy:
5353
fail-fast: false
54-
#max-parallel: 1
54+
max-parallel: 20
5555
matrix:
5656
platform-url:
5757
- https://espressif.github.io/arduino-esp32/package_esp32_index.json
@@ -63,15 +63,17 @@ jobs:
6363
- UnitColor
6464

6565
board:
66+
- arduino_nesso_n1
6667
- m5stack_atom
6768
- m5stack_atoms3
6869
- m5stack_capsule
69-
# - m5stack_cardputer
70+
- m5stack_cardputer
7071
- m5stack_core
7172
- m5stack_core2
7273
- m5stack_coreink
7374
- m5stack_cores3
7475
- m5stack_dial
76+
- m5stack_dinmeter
7577
- m5stack_fire
7678
- m5stack_nanoc6
7779
- m5stack_paper
@@ -83,13 +85,14 @@ jobs:
8385
# - m5stack_stickc
8486
- m5stack_stickc_plus
8587
- m5stack_stickc_plus2
88+
- m5stack_tab5
8689
# - m5stack_timer_cam
8790
# - m5stack_tough
8891
# - m5stack_unit_cam
8992
# - m5stack_unit_cams3
9093

9194
platform-version:
92-
- 3.0.4
95+
- 3.3.6
9396

9497
platform:
9598
- esp32
@@ -100,19 +103,27 @@ jobs:
100103
steps:
101104
- name: Checkout
102105
uses: actions/checkout@v4
103-
with:
104-
ref: ${{ github.event.pull_request.head.sha }}
105106

106-
# Build
107+
- name: Prepare libraries list
108+
id: libs
109+
run: |
110+
{
111+
echo "yaml<<EOF"
112+
echo "$REQUIRED_LIBRARIES" | tr ',' '\n' | while read -r lib; do
113+
echo "- name: $lib"
114+
done
115+
echo "- source-path: ./"
116+
echo "EOF"
117+
} >> "$GITHUB_OUTPUT"
118+
107119
- name: Compile examples
108-
uses: ArminJo/arduino-test-compile@master
120+
uses: arduino/compile-sketches@v1
109121
with:
110-
arduino-board-fqbn: ${{ matrix.platform }}:${{ matrix.archi }}:${{ matrix.board }}
111-
arduino-platform: ${{ matrix.platform }}:${{ matrix.archi }}@${{ matrix.platform-version }}
112-
platform-url: ${{ matrix.platform-url }}
113-
required-libraries: ${{ env.REQUIRED_LIBRARIES }}
114-
extra-arduino-cli-args: ${{ matrix.cli-args }}
115-
#build-properties: ${{ toJson(matrix.build-properties) }}
116-
sketch-names: ${{ matrix.sketch }}.ino
117-
sketch-names-find-start: ${{ env.SKETCH_NAMES_FIND_START }}/${{ matrix.unit }}
118-
#sketches-exclude: ${{ matrix.sketches-exclude }}
122+
fqbn: ${{ matrix.platform }}:${{ matrix.archi }}:${{ matrix.board }}
123+
platforms: |
124+
- name: ${{ matrix.platform }}:${{ matrix.archi }}
125+
source-url: ${{ matrix.platform-url }}
126+
version: ${{ matrix.platform-version }}
127+
libraries: ${{ steps.libs.outputs.yaml }}
128+
sketch-paths: |
129+
- ${{ env.SKETCH_NAMES_FIND_START }}/${{ matrix.unit }}/${{ matrix.sketch }}

‎.github/workflows/arduino-m5-build-check.yml‎

Lines changed: 46 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -12,28 +12,28 @@ on:
1212
branches:
1313
- '*'
1414
paths:
15-
- 'src/unit/**.cpp'
16-
- 'src/unit/**.hpp'
17-
- 'src/unit/**.h'
18-
- 'src/unit/**.c'
15+
- 'src/**.cpp'
16+
- 'src/**.hpp'
17+
- 'src/**.h'
18+
- 'src/**.c'
1919
- 'examples/UnitUnified/**.ino'
2020
- 'examples/UnitUnified/**.cpp'
2121
- 'examples/UnitUnified/**.hpp'
2222
- 'examples/UnitUnified/**.h'
2323
- 'examples/UnitUnified/**.c'
24-
- '**arduino-m5-build-check.yml'
24+
- '.github/workflows/arduino-m5-build-check.yml'
2525
pull_request:
2626
paths:
27-
- 'src/unit/**.cpp'
28-
- 'src/unit/**.hpp'
29-
- 'src/unit/**.h'
30-
- 'src/unit/**.c'
27+
- 'src/**.cpp'
28+
- 'src/**.hpp'
29+
- 'src/**.h'
30+
- 'src/**.c'
3131
- 'examples/UnitUnified/**.ino'
3232
- 'examples/UnitUnified/**.cpp'
3333
- 'examples/UnitUnified/**.hpp'
3434
- 'examples/UnitUnified/**.h'
3535
- 'examples/UnitUnified/**.c'
36-
- '**arduino-m5-build-check.yml'
36+
- '.github/workflows/arduino-m5-build-check.yml'
3737
workflow_dispatch:
3838

3939
defaults:
@@ -48,11 +48,11 @@ jobs:
4848
build:
4949
name: ${{ matrix.unit }}:${{ matrix.sketch }}:${{matrix.board}}@${{matrix.platform-version}}
5050
runs-on: ubuntu-latest
51-
timeout-minutes: 5
51+
timeout-minutes: 12
5252

5353
strategy:
5454
fail-fast: false
55-
# max-parallel: 1
55+
max-parallel: 20
5656
matrix:
5757
platform-url:
5858
- https://m5stack.oss-cn-shenzhen.aliyuncs.com/resource/arduino/package_m5stack_index.json
@@ -64,34 +64,44 @@ jobs:
6464
- UnitColor
6565

6666
board:
67+
- arduino_nesso_n1
6768
- m5stack_atom
6869
- m5stack_atoms3
6970
- m5stack_atoms3r
7071
- m5stack_capsule
71-
# - m5stack_cardputer
72+
- m5stack_cardputer
73+
# - m5stack_chain_dualkey
7274
- m5stack_core
7375
- m5stack_core2
7476
- m5stack_coreink
7577
- m5stack_cores3
7678
- m5stack_dial
7779
- m5stack_dinmeter
7880
- m5stack_fire
81+
- m5stack_nano_c6
82+
# - m5stack_nano_h2
7983
- m5stack_paper
84+
- m5stack_papers3
8085
# - m5stack_poe_cam
86+
# - m5stack_powerhub
8187
# - m5stack_stamp_c3
8288
# - m5stack_stamp_pico
8389
- m5stack_stamp_s3
90+
# - m5stack_stamplc
8491
# - m5stack_station
85-
# - m5stack_stickc
92+
- m5stack_stickc
8693
- m5stack_stickc_plus
8794
- m5stack_stickc_plus2
95+
- m5stack_sticks3
96+
- m5stack_tab5
8897
# - m5stack_timer_cam
8998
# - m5stack_tough
99+
# - m5stack_unit_c6l
90100
# - m5stack_unit_cam
91101
# - m5stack_unit_cams3
92102

93103
platform-version:
94-
- 2.1.2
104+
- 3.2.5
95105

96106
platform:
97107
- m5stack
@@ -103,20 +113,27 @@ jobs:
103113
steps:
104114
- name: Checkout
105115
uses: actions/checkout@v4
106-
with:
107-
ref: ${{ github.event.pull_request.head.sha }}
108116

109-
# Build
117+
- name: Prepare libraries list
118+
id: libs
119+
run: |
120+
{
121+
echo "yaml<<EOF"
122+
echo "$REQUIRED_LIBRARIES" | tr ',' '\n' | while read -r lib; do
123+
echo "- name: $lib"
124+
done
125+
echo "- source-path: ./"
126+
echo "EOF"
127+
} >> "$GITHUB_OUTPUT"
128+
110129
- name: Compile examples
111-
uses: ArminJo/arduino-test-compile@master
130+
uses: arduino/compile-sketches@v1
112131
with:
113-
arduino-board-fqbn: ${{ matrix.platform }}:${{ matrix.archi }}:${{ matrix.board }}
114-
arduino-platform: ${{ matrix.platform }}:${{ matrix.archi }}@${{ matrix.platform-version }}
115-
platform-url: ${{ matrix.platform-url }}
116-
required-libraries: ${{ env.REQUIRED_LIBRARIES }}
117-
extra-arduino-cli-args: ${{ matrix.cli-args }}
118-
#build-properties: ${{ toJson(matrix.build-properties) }}
119-
sketch-names: ${{ matrix.sketch }}.ino
120-
sketch-names-find-start: ${{ env.SKETCH_NAMES_FIND_START }}/${{ matrix.unit }}
121-
#sketches-exclude: ${{ matrix.sketches-exclude }}
122-
132+
fqbn: ${{ matrix.platform }}:${{ matrix.archi }}:${{ matrix.board }}
133+
platforms: |
134+
- name: ${{ matrix.platform }}:${{ matrix.archi }}
135+
source-url: ${{ matrix.platform-url }}
136+
version: ${{ matrix.platform-version }}
137+
libraries: ${{ steps.libs.outputs.yaml }}
138+
sketch-paths: |
139+
- ${{ env.SKETCH_NAMES_FIND_START }}/${{ matrix.unit }}/${{ matrix.sketch }}

0 commit comments

Comments
 (0)