Skip to content

Commit cc83cb5

Browse files
committed
fix: add arduino-2 CI back
1 parent 8e7c7a1 commit cc83cb5

File tree

2 files changed

+30
-19
lines changed

2 files changed

+30
-19
lines changed

.github/workflows/ci.yml

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,27 +28,27 @@ jobs:
2828
fail-fast: false
2929
matrix:
3030
include:
31-
- name: CI ESP8266
31+
- name: ESP8266
3232
core: esp8266:esp8266
3333
board: esp8266:esp8266:huzzah
3434
index_url: https://arduino.esp8266.com/stable/package_esp8266com_index.json
3535

36-
- name: CI ESP32
36+
- name: ESP32
3737
core: esp32:esp32
3838
board: esp32:esp32:esp32
3939
index_url: https://espressif.github.io/arduino-esp32/package_esp32_index.json
4040

41-
- name: CI ESP32 (Dev Branch)
41+
- name: ESP32 (Dev Branch)
4242
core: esp32:esp32
4343
board: esp32:esp32:esp32
4444
index_url: https://espressif.github.io/arduino-esp32/package_esp32_dev_index.json
4545

46-
- name: CI Pico W | RP2040+W
46+
- name: Pico W | RP2040+W
4747
core: rp2040:rp2040
4848
board: rp2040:rp2040:rpipicow
4949
index_url: https://github.com/earlephilhower/arduino-pico/releases/download/global/package_rp2040_index.json
5050

51-
- name: CI Pico 2W | RP2350+W
51+
- name: Pico 2W | RP2350+W
5252
core: rp2040:rp2040
5353
board: rp2040:rp2040:rpipico2w
5454
index_url: https://github.com/earlephilhower/arduino-pico/releases/download/global/package_rp2040_index.json
@@ -104,41 +104,45 @@ jobs:
104104
fail-fast: false
105105
matrix:
106106
include:
107-
- name: CI ESP8266 (Huzzah)
107+
- name: ESP8266 (Huzzah)
108108
env: ci-esp8266
109109
board: huzzah
110110

111-
- name: CI ESP8266 (D1 Mini)
111+
- name: ESP8266 (D1 Mini)
112112
env: ci-esp8266
113113
board: d1_mini
114114

115-
- name: CI ESP32
115+
- name: ESP32 (Arduino Core v2)
116+
env: ci-esp32-arduino-2
117+
board: esp32dev
118+
119+
- name: ESP32
116120
env: ci-esp32
117121
board: esp32dev
118122

119-
- name: CI ESP32-S2
123+
- name: ESP32-S2
120124
env: ci-esp32
121125
board: esp32-s2-saola-1
122126

123-
- name: CI ESP32-S3
127+
- name: ESP32-S3
124128
env: ci-esp32
125129
board: esp32-s3-devkitc-1
126130

127-
- name: CI ESP32-C3
131+
- name: ESP32-C3
128132
env: ci-esp32
129133
board: esp32-c3-devkitc-02
130134

131-
- name: CI ESP32-C6
135+
- name: ESP32-C6
132136
env: ci-esp32
133137
board: esp32-c6-devkitc-1
134138

135-
- name: CI Pico W | RP2040+W
139+
- name: Pico W | RP2040+W
136140
env: ci-rp2040
137141
board: rpipicow
138142
platform: https://github.com/maxgerhardt/platform-raspberrypi.git
139143
opts: "--project-option 'board_build.core=earlephilhower'"
140144

141-
- name: CI Pico 2W | RP2350+W
145+
- name: Pico 2W | RP2350+W
142146
env: ci-rp2350
143147
board: rpipico2w
144148
platform: https://github.com/maxgerhardt/platform-raspberrypi.git

platformio.ini

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ build_flags =
55
-D CONFIG_ARDUHAL_LOG_COLORS
66
-D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
77
lib_deps =
8-
ESP32Async/ESPAsyncWebServer@^3.7.3
8+
esp32async/ESPAsyncWebServer@^3.7.3
99
upload_protocol = esptool
1010
monitor_speed = 115200
1111
monitor_filters = esp32_exception_decoder, log2file
@@ -20,14 +20,14 @@ build_flags = ${env.build_flags}
2020
platform = https://github.com/pioarduino/platform-espressif32/releases/download/53.03.11/platform-espressif32.zip
2121
board = esp32-s3-devkitc-1
2222
lib_deps =
23-
ESP32Async/AsyncTCP@^3.3.7
23+
esp32async/AsyncTCP@^3.3.7
2424
${env.lib_deps}
2525

2626
[env:esp8266]
2727
platform = espressif8266
2828
board = huzzah
2929
lib_deps =
30-
ESP32Async/ESPAsyncTCP@^2.0.0
30+
esp32async/ESPAsyncTCP@^2.0.0
3131
${env.lib_deps}
3232

3333
[env:picow]
@@ -60,14 +60,21 @@ lib_ignore =
6060
platform = espressif8266
6161
board = ${sysenv.PIO_BOARD}
6262
lib_deps =
63-
ESP32Async/ESPAsyncTCP@^2.0.0
63+
esp32async/ESPAsyncTCP@^2.0.0
64+
${env.lib_deps}
65+
66+
[env:ci-esp32-arduino-2]
67+
platform = espressif32@6.7.0
68+
board = ${sysenv.PIO_BOARD}
69+
lib_deps =
70+
esp32async/AsyncTCP@^3.3.7
6471
${env.lib_deps}
6572

6673
[env:ci-esp32]
6774
platform = https://github.com/pioarduino/platform-espressif32/releases/download/53.03.11/platform-espressif32.zip
6875
board = ${sysenv.PIO_BOARD}
6976
lib_deps =
70-
ESP32Async/AsyncTCP@^3.3.7
77+
esp32async/AsyncTCP@^3.3.7
7178
${env.lib_deps}
7279

7380
[env:ci-rp2040]

0 commit comments

Comments
 (0)