Skip to content

Commit d8076ed

Browse files
GOB52GOB52
committed
Merge branch 'develop'
2 parents 45eeda9 + 79aa401 commit d8076ed

25 files changed

Lines changed: 971 additions & 532 deletions

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

Lines changed: 59 additions & 38 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:
@@ -46,21 +46,26 @@ concurrency:
4646

4747
jobs:
4848
build:
49-
name: ${{ matrix.unit }}:${{ matrix.sketch }}:${{matrix.board}}@${{matrix.platform-version}}
49+
name: ${{ matrix.nfctype }}:${{ 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
5555
max-parallel: 20
56-
5756
matrix:
5857
platform-url:
5958
- https://espressif.github.io/arduino-esp32/package_esp32_index.json
6059

60+
nfctype:
61+
- NFCA
62+
6163
sketch:
6264
- Detect
6365

66+
build-properties:
67+
- "-DUSING_UNIT_RFID2"
68+
6469
board:
6570
- m5stack-atom
6671
- m5stack-atoms3
@@ -70,61 +75,77 @@ jobs:
7075
- m5stack-cores3
7176
- m5stack-fire
7277

78+
platform-version:
79+
- 2.0.17
80+
81+
platform:
82+
- esp32
83+
84+
archi:
85+
- esp32
86+
7387
include:
7488
# Specific sketches
7589
- sketch: Dump
90+
nfctype: NFCA
7691
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
7792
platform: esp32
7893
archi: esp32
7994
platform-version: 2.0.17
8095
board: m5stack-core-esp32
96+
build-properties: "-DUSING_UNIT_RFID2"
8197
- sketch: ValueBlock
98+
nfctype: NFCA
8299
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
83100
platform: esp32
84101
archi: esp32
85102
platform-version: 2.0.17
86103
board: m5stack-core-esp32
104+
build-properties: "-DUSING_UNIT_RFID2"
87105
- sketch: ReadWrite
106+
nfctype: NFCA
88107
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
89108
platform: esp32
90109
archi: esp32
91110
platform-version: 2.0.17
92111
board: m5stack-core-esp32
112+
build-properties: "-DUSING_UNIT_RFID2"
93113
- sketch: NDEF
114+
nfctype: NFCA
94115
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
95116
platform: esp32
96117
archi: esp32
97118
platform-version: 2.0.17
98119
board: m5stack-core-esp32
99-
100-
unit:
101-
- ''
102-
103-
platform-version:
104-
- 2.0.17
105-
106-
platform:
107-
- esp32
108-
109-
archi:
110-
- esp32
120+
build-properties: "-DUSING_UNIT_RFID2"
111121

112122
steps:
113123
- name: Checkout
114124
uses: actions/checkout@v4
115-
with:
116-
ref: ${{ github.event.pull_request.head.sha }}
117125

118-
# Build
126+
- name: Prepare libraries list
127+
id: libs
128+
run: |
129+
{
130+
echo "yaml<<EOF"
131+
echo "$REQUIRED_LIBRARIES" | tr ',' '\n' | while read -r lib; do
132+
echo "- name: $lib"
133+
done
134+
echo "- source-path: ./"
135+
echo "EOF"
136+
} >> "$GITHUB_OUTPUT"
137+
119138
- name: Compile examples
120-
uses: ArminJo/arduino-test-compile@master
139+
uses: arduino/compile-sketches@v1
121140
with:
122-
arduino-board-fqbn: ${{ matrix.platform }}:${{ matrix.archi }}:${{ matrix.board }}
123-
arduino-platform: ${{ matrix.platform }}:${{ matrix.archi }}@${{ matrix.platform-version }}
124-
platform-url: ${{ matrix.platform-url }}
125-
required-libraries: ${{ env.REQUIRED_LIBRARIES }}
126-
extra-arduino-cli-args: ${{ matrix.cli-args }}
127-
#build-properties: ${{ toJson(matrix.build-properties) }}
128-
sketch-names: ${{ matrix.sketch }}.ino
129-
sketch-names-find-start: ${{ env.SKETCH_NAMES_FIND_START }}/${{ matrix.unit }}
130-
#sketches-exclude: ${{ matrix.sketches-exclude }}
141+
fqbn: ${{ matrix.platform }}:${{ matrix.archi }}:${{ matrix.board }}
142+
platforms: |
143+
- name: ${{ matrix.platform }}:${{ matrix.archi }}
144+
source-url: ${{ matrix.platform-url }}
145+
version: ${{ matrix.platform-version }}
146+
libraries: ${{ steps.libs.outputs.yaml }}
147+
sketch-paths: |
148+
- ${{ env.SKETCH_NAMES_FIND_START }}/${{ matrix.nfctype }}/${{ matrix.sketch }}
149+
cli-compile-flags: |
150+
- --build-property
151+
- build.extra_flags=${{ matrix.build-properties }}

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

Lines changed: 65 additions & 51 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-v3-build-check.yml'
24+
- '.github/workflows/arduino-esp-v3-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-v3-build-check.yml'
36+
- '.github/workflows/arduino-esp-v3-build-check.yml'
3737
workflow_dispatch:
3838

3939
defaults:
@@ -46,103 +46,117 @@ concurrency:
4646

4747
jobs:
4848
build:
49-
name: ${{ matrix.unit }}:${{ matrix.sketch }}:${{matrix.board}}@${{matrix.platform-version}}
49+
name: ${{ matrix.nfctype }}:${{ 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
5555
max-parallel: 20
56-
5756
matrix:
5857
platform-url:
5958
- https://espressif.github.io/arduino-esp32/package_esp32_index.json
6059

60+
nfctype:
61+
- NFCA
62+
6163
sketch:
6264
- Detect
6365

64-
unit:
65-
- ''
66+
build-properties:
67+
- "-DUSING_UNIT_RFID2"
6668

6769
board:
70+
- arduino_nesso_n1
6871
- m5stack_atom
6972
- m5stack_atoms3
7073
- m5stack_capsule
71-
# - m5stack_cardputer
74+
- m5stack_cardputer
7275
- m5stack_core
7376
- m5stack_core2
7477
- m5stack_coreink
7578
- m5stack_cores3
7679
- m5stack_dial
80+
- m5stack_dinmeter
7781
- m5stack_fire
7882
- m5stack_nanoc6
7983
- m5stack_paper
80-
# - m5stack_poe_cam
81-
# - m5stack_stamp_c3
82-
# - m5stack_stamp_pico
8384
- m5stack_stamp_s3
84-
# - m5stack_station
85-
# - m5stack_stickc
8685
- m5stack_stickc_plus
8786
- m5stack_stickc_plus2
88-
# - m5stack_timer_cam
89-
# - m5stack_tough
90-
# - m5stack_unit_cam
91-
# - m5stack_unit_cams3
87+
- m5stack_tab5
88+
89+
platform-version:
90+
- 3.3.6
9291

92+
platform:
93+
- esp32
94+
95+
archi:
96+
- esp32
9397

9498
include:
9599
# Specific sketches
96100
- sketch: Dump
101+
nfctype: NFCA
97102
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
98-
platform-version: 3.0.4
99103
platform: esp32
100104
archi: esp32
105+
platform-version: 3.3.6
101106
board: m5stack_core
107+
build-properties: "-DUSING_UNIT_RFID2"
102108
- sketch: ValueBlock
109+
nfctype: NFCA
103110
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
104-
platform-version: 3.0.4
105111
platform: esp32
106112
archi: esp32
113+
platform-version: 3.3.6
107114
board: m5stack_core
115+
build-properties: "-DUSING_UNIT_RFID2"
108116
- sketch: ReadWrite
117+
nfctype: NFCA
109118
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
110-
platform-version: 3.0.4
111119
platform: esp32
112120
archi: esp32
121+
platform-version: 3.3.6
113122
board: m5stack_core
123+
build-properties: "-DUSING_UNIT_RFID2"
114124
- sketch: NDEF
125+
nfctype: NFCA
115126
platform-url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
116-
platform-version: 3.0.4
117127
platform: esp32
118128
archi: esp32
129+
platform-version: 3.3.6
119130
board: m5stack_core
120-
121-
platform-version:
122-
- 3.1.3
123-
124-
platform:
125-
- esp32
126-
127-
archi:
128-
- esp32
131+
build-properties: "-DUSING_UNIT_RFID2"
129132

130133
steps:
131134
- name: Checkout
132135
uses: actions/checkout@v4
133-
with:
134-
ref: ${{ github.event.pull_request.head.sha }}
135136

136-
# Build
137+
- name: Prepare libraries list
138+
id: libs
139+
run: |
140+
{
141+
echo "yaml<<EOF"
142+
echo "$REQUIRED_LIBRARIES" | tr ',' '\n' | while read -r lib; do
143+
echo "- name: $lib"
144+
done
145+
echo "- source-path: ./"
146+
echo "EOF"
147+
} >> "$GITHUB_OUTPUT"
148+
137149
- name: Compile examples
138-
uses: ArminJo/arduino-test-compile@master
150+
uses: arduino/compile-sketches@v1
139151
with:
140-
arduino-board-fqbn: ${{ matrix.platform }}:${{ matrix.archi }}:${{ matrix.board }}
141-
arduino-platform: ${{ matrix.platform }}:${{ matrix.archi }}@${{ matrix.platform-version }}
142-
platform-url: ${{ matrix.platform-url }}
143-
required-libraries: ${{ env.REQUIRED_LIBRARIES }}
144-
extra-arduino-cli-args: ${{ matrix.cli-args }}
145-
#build-properties: ${{ toJson(matrix.build-properties) }}
146-
sketch-names: ${{ matrix.sketch }}.ino
147-
sketch-names-find-start: ${{ env.SKETCH_NAMES_FIND_START }}/${{ matrix.unit }}
148-
#sketches-exclude: ${{ matrix.sketches-exclude }}
152+
fqbn: ${{ matrix.platform }}:${{ matrix.archi }}:${{ matrix.board }}
153+
platforms: |
154+
- name: ${{ matrix.platform }}:${{ matrix.archi }}
155+
source-url: ${{ matrix.platform-url }}
156+
version: ${{ matrix.platform-version }}
157+
libraries: ${{ steps.libs.outputs.yaml }}
158+
sketch-paths: |
159+
- ${{ env.SKETCH_NAMES_FIND_START }}/${{ matrix.nfctype }}/${{ matrix.sketch }}
160+
cli-compile-flags: |
161+
- --build-property
162+
- build.extra_flags=${{ matrix.build-properties }}

0 commit comments

Comments
 (0)