Skip to content

Commit 0982be6

Browse files
committed
fix: ci and platformio.ini
1 parent 2afdff6 commit 0982be6

File tree

2 files changed

+98
-33
lines changed

2 files changed

+98
-33
lines changed

.github/workflows/ci.yml

Lines changed: 42 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -22,28 +22,36 @@ on:
2222

2323
jobs:
2424
arduino:
25-
name: arduino ${{ matrix.name }}
25+
name: Arduino - ${{ matrix.name }}
2626
runs-on: ubuntu-latest
2727
strategy:
2828
fail-fast: false
2929
matrix:
3030
include:
31-
- name: package_esp32_index.json
31+
- name: CI ESP32
3232
core: esp32:esp32
3333
board: esp32:esp32:esp32
3434
index_url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
35-
- name: package_esp32_dev_index.json
35+
36+
- name: CI ESP32 (Dev Branch)
3637
core: esp32:esp32
3738
board: esp32:esp32:esp32
3839
index_url: https://espressif.github.io/arduino-esp32/package_esp32_dev_index.json
40+
3941
# - name: package_esp8266com_index.json
4042
# core: esp8266:esp8266
4143
# board: esp8266:esp8266:huzzah
4244
# index_url: https://arduino.esp8266.com/stable/package_esp8266com_index.json
43-
- name: package_rp2040_index.json
45+
46+
- name: CI Pico W | RP2040+W
4447
core: rp2040:rp2040
4548
board: rp2040:rp2040:rpipicow
4649
index_url: https://github.com/earlephilhower/arduino-pico/releases/download/global/package_rp2040_index.json
50+
51+
- name: CI Pico 2W | RP2350+W
52+
core: rp2040:rp2350
53+
board: rp2040:rp2350:rpipico2w
54+
index_url: https://github.com/earlephilhower/arduino-pico/releases/download/global/package_rp2040_index.json
4755
steps:
4856
- name: Checkout
4957
uses: actions/checkout@v4
@@ -96,7 +104,7 @@ jobs:
96104
run: arduino-cli compile --library . --warnings none -b ${{ matrix.board }} "examples/AsyncDemo/AsyncDemo.ino"
97105

98106
platformio:
99-
name: pio ${{ matrix.env }}:${{ matrix.board }}
107+
name: PlatformIO - ${{ matrix.name }}
100108
runs-on: ubuntu-latest
101109
strategy:
102110
fail-fast: false
@@ -106,22 +114,35 @@ jobs:
106114
# board: huzzah
107115
# - env: ci-esp8266
108116
# board: d1_mini
109-
- env: ci-arduino-3
117+
- name: CI ESP32
118+
env: ci-esp32
110119
board: esp32dev
111-
- env: ci-arduino-3
120+
121+
- name: CI ESP32-S2
122+
env: ci-esp32
112123
board: esp32-s2-saola-1
113-
- env: ci-arduino-3
124+
125+
- name: CI ESP32-S3
126+
env: ci-esp32
114127
board: esp32-s3-devkitc-1
115-
- env: ci-arduino-3
128+
129+
- name: CI ESP32-C3
130+
env: ci-esp32
116131
board: esp32-c3-devkitc-02
117-
- env: ci-arduino-3
132+
133+
- name: CI ESP32-C6
134+
env: ci-esp32
118135
board: esp32-c6-devkitc-1
119-
- env: rpipico|arduino-pico
120-
board: rpipico
136+
137+
- name: CI Pico W | RP2040+W
138+
env: rpipicow|arduino-pico
139+
board: rpipicow
121140
platform: https://github.com/maxgerhardt/platform-raspberrypi.git
122141
opts: "--project-option 'board_build.core=earlephilhower'"
123-
- env: rpipico2|arduino-pico
124-
board: rpipico2
142+
143+
- name: CI Pico 2W | RP2350+W
144+
env: rpipico2w|arduino-pico
145+
board: rpipico2w
125146
platform: https://github.com/maxgerhardt/platform-raspberrypi.git
126147
opts: "--project-option 'board_build.core=earlephilhower'"
127148
steps:
@@ -135,16 +156,15 @@ jobs:
135156
~/.platformio
136157
~/.cache/pip
137158
138-
- uses: actions/setup-python@v5
159+
- name: Setup Python
160+
uses: actions/setup-python@v5
139161
with:
140162
python-version: "3.x"
141-
142-
- name: Install PlatformIO
143-
run: pip install platformio
144-
145-
- name: Install Platform
146-
if: ${{ matrix.platform }}
147-
run: platformio platform install ${{ matrix.platform }}
148163

164+
- name: Setup PlatformIO
165+
run: |
166+
python -m pip install --upgrade pip
167+
pip install --upgrade platformio
168+
149169
- run: PLATFORMIO_SRC_DIR=examples/Demo PIO_BOARD=${{ matrix.board }} pio run -e ${{ matrix.env }}
150170
- run: PLATFORMIO_BUILD_FLAGS="-DNETWIZARD_USE_ASYNC_WEBSERVER=1" PLATFORMIO_SRC_DIR=examples/AsyncDemo PIO_BOARD=${{ matrix.board }} pio run -e ${{ matrix.env }}

platformio.ini

Lines changed: 56 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ build_flags =
77
-D NETWIZARD_USE_ASYNC_WEBSERVER=1
88
lib_deps =
99
bblanchon/ArduinoJson@7.1.0
10-
mathieucarbou/AsyncTCP@^3.2.4
11-
mathieucarbou/ESPAsyncWebServer@3.1.2
10+
ESP32Async/ESPAsyncWebServer@^3.7.0
1211
upload_protocol = esptool
1312
monitor_speed = 115200
1413
monitor_filters = esp32_exception_decoder, log2file
@@ -18,23 +17,69 @@ lib_dir = .
1817
src_dir = examples/Demo
1918
; src_dir = examples/AsyncDemo
2019

21-
[env:arduino-3]
22-
platform = espressif32
23-
platform_packages=
24-
platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.3
25-
platformio/framework-arduinoespressif32-libs @ https://github.com/espressif/arduino-esp32/releases/download/3.0.3/esp32-arduino-libs-3.0.3.zip
20+
[env:esp32]
21+
build_flags = ${env.build_flags} ${dev.build_flags}
22+
platform = https://github.com/pioarduino/platform-espressif32/releases/download/53.03.11/platform-espressif32.zip
2623
board = esp32-s3-devkitc-1
24+
lib_deps =
25+
ESP32Async/AsyncTCP@^3.3.5
2726

2827
[env:esp8266]
2928
platform = espressif8266
3029
board = huzzah
3130
lib_deps =
32-
bblanchon/ArduinoJson@7.1.0
33-
mathieucarbou/ESPAsyncWebServer@3.1.2
34-
esphome/ESPAsyncTCP-esphome@2.0.0
31+
vshymanskyy/Preferences@^2.1.0
32+
ESP32Async/ESPAsyncTCP@^2.0.0
3533

3634
[env:pico]
3735
platform = https://github.com/maxgerhardt/platform-raspberrypi.git
3836
board = pico
3937
framework = arduino
40-
board_build.core = earlephilhower
38+
board_build.core = earlephilhower
39+
lib_deps =
40+
vshymanskyy/Preferences@^2.1.0
41+
khoih-prog/AsyncTCP_RP2040W@^1.2.0
42+
43+
[env:pico2]
44+
platform = https://github.com/maxgerhardt/platform-raspberrypi.git
45+
board = pico2
46+
framework = arduino
47+
board_build.core = earlephilhower
48+
lib_deps =
49+
vshymanskyy/Preferences@^2.1.0
50+
khoih-prog/AsyncTCP_RP2040W@^1.2.0
51+
52+
53+
; ------------
54+
; CI Workflows
55+
; ------------
56+
57+
[env:ci-esp32]
58+
platform = https://github.com/pioarduino/platform-espressif32/releases/download/53.03.11/platform-espressif32.zip
59+
board = ${sysenv.PIO_BOARD}
60+
61+
[env:ci-esp8266]
62+
platform = espressif8266
63+
board = ${sysenv.PIO_BOARD}
64+
lib_deps =
65+
ESP32Async/ESPAsyncTCP@^2.0.0
66+
ESP32Async/ESPAsyncWebServer@^3.7.0
67+
68+
69+
[env:ci-rp2040]
70+
platform = https://github.com/maxgerhardt/platform-raspberrypi.git
71+
board = pico
72+
framework = arduino
73+
board_build.core = earlephilhower
74+
lib_deps =
75+
vshymanskyy/Preferences@^2.1.0
76+
khoih-prog/AsyncTCP_RP2040W@^1.2.0
77+
78+
[env:ci-rp2350]
79+
platform = https://github.com/maxgerhardt/platform-raspberrypi.git
80+
board = pico2
81+
framework = arduino
82+
board_build.core = earlephilhower
83+
lib_deps =
84+
vshymanskyy/Preferences@^2.1.0
85+
khoih-prog/AsyncTCP_RP2040W@^1.2.0

0 commit comments

Comments
 (0)