Skip to content

Commit 9364cc6

Browse files
authored
Esp32 build fix (#12700)
* Fix up esp32 builds and make sure CI will catch future errors in using build_examples to compile * Fix build instruction typo
1 parent 9e0baa5 commit 9364cc6

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

.github/workflows/examples-esp32.yaml

+15-14
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@ jobs:
2828
name: ESP32
2929
timeout-minutes: 85
3030

31-
env:
32-
BUILD_TYPE: esp32
33-
3431
runs-on: ubuntu-latest
3532
if: github.actor != 'restyled-io[bot]'
3633

@@ -62,29 +59,33 @@ jobs:
6259
path: |
6360
.environment/gn_out/.ninja_log
6461
.environment/pigweed-venv/*.log
65-
- name: Build example All Clusters App
66-
timeout-minutes: 10
67-
run: scripts/examples/esp_example.sh all-clusters-app sdkconfig_m5stack.defaults
68-
- name: Copy aside build products
62+
- name: Build some M5Stack variations
63+
timeout-minutes: 20
64+
run: |
65+
./scripts/run_in_build_env.sh \
66+
"./scripts/build/build_examples.py \
67+
--enable-flashbundle \
68+
--target-glob '*-m5stack-{all-clusters,all-clusters-rpc-ipv6only}' \
69+
build \
70+
--copy-artifacts-to out/artifacts \
71+
"
72+
- name: Prepare bloat report
6973
run: |
70-
mkdir -p example_binaries/$BUILD_TYPE-build
71-
cp examples/all-clusters-app/esp32/build/chip-all-clusters-app.elf \
72-
example_binaries/$BUILD_TYPE-build/chip-all-clusters-app.elf
7374
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
7475
esp32 m5stack all-clusters-app \
75-
example_binaries/$BUILD_TYPE-build/chip-all-clusters-app.elf \
76+
out/esp32-m5stack-all-clusters/chip-all-clusters-app.elf \
7677
/tmp/bloat_reports/
7778
- name: Build example All Clusters App C3
7879
timeout-minutes: 10
7980
run: scripts/examples/esp_example.sh all-clusters-app sdkconfig_c3devkit.defaults
8081
- name: Copy aside build products
8182
run: |
82-
mkdir -p example_binaries/$BUILD_TYPE-build
83+
mkdir -p example_binaries/esp32-build
8384
cp examples/all-clusters-app/esp32/build/chip-all-clusters-app.elf \
84-
example_binaries/$BUILD_TYPE-build/chip-all-clusters-app.elf
85+
example_binaries/esp32-build/chip-all-clusters-app.elf
8586
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
8687
esp32 c3devkit all-clusters-app \
87-
example_binaries/$BUILD_TYPE-build/chip-all-clusters-app.elf \
88+
example_binaries/esp32-build/chip-all-clusters-app.elf \
8889
/tmp/bloat_reports/
8990
- name: Build example Pigweed App
9091
timeout-minutes: 10

scripts/build/runner/shell.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def __init__(self, level):
2929
self.daemon = False
3030
self.level = level
3131
self.fd_read, self.fd_write = os.pipe()
32-
self.pipeReader = os.fdopen(self.fd_read)
32+
self.pipeReader = os.fdopen(self.fd_read, errors='replace')
3333
self.start()
3434

3535
def fileno(self):

src/platform/ESP32/InetPlatformConfig.h

-1
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,3 @@
4141
#ifndef INET_CONFIG_NUM_UDP_ENDPOINTS
4242
#define INET_CONFIG_NUM_UDP_ENDPOINTS CONFIG_NUM_UDP_ENDPOINTS
4343
#endif // INET_CONFIG_NUM_UDP_ENDPOINTS
44-
#define INET_CONFIG_ENABLE_IPV4 1

0 commit comments

Comments
 (0)