Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[esp32] migrate ESP32 dokcer image to 0.5.27 #11662

Merged
merged 1 commit into from
Nov 11, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/examples-esp32.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-esp32:0.5.25
image: connectedhomeip/chip-build-esp32:0.5.27
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/qemu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-esp32-qemu:0.5.25
image: connectedhomeip/chip-build-esp32-qemu:0.5.27
volumes:
- "/tmp/log_output:/tmp/test_logs"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release_artifacts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
runs-on: ubuntu-latest

container:
image: connectedhomeip/chip-build-esp32:0.5.25
image: connectedhomeip/chip-build-esp32:0.5.27

steps:
- name: Checkout
Expand Down
8 changes: 4 additions & 4 deletions config/esp32/components/chip/component.mk
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ COMPONENT_ADD_INCLUDEDIRS += $(REL_OUTPUT_DIR)/src/include \

# Tell the ESP-IDF build system that the CHIP component defines its own build
# and clean targets.
COMPONENT_OWNBUILDTARGET = 1
COMPONENT_OWNCLEANTARGET = 1
COMPONENT_OWNBUILDTARGET := chip_build
COMPONENT_OWNCLEANTARGET := chip_clean

is_debug ?= true

Expand Down Expand Up @@ -156,10 +156,10 @@ endif
cd $(COMPONENT_PATH); ninja $(subst 1,-v,$(filter 1,$(V))) -C $(OUTPUT_DIR) esp32


build : install-chip
chip_build : install-chip
echo "CHIP built and installed..."
cp -a ${OUTPUT_DIR}/lib/libCHIP.a ${OUTPUT_DIR}/libchip.a

clean:
chip_clean:
echo "RM $(OUTPUT_DIR)"
rm -rf $(OUTPUT_DIR)
5 changes: 3 additions & 2 deletions scripts/requirements.esp32.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
setuptools>=21
click>=5.0
pyserial>=3.0
click>=7.0
pyserial>=3.3
future>=0.15.2
cryptography>=2.1.4
pyparsing>=2.0.3,<2.4.0
pyelftools>=0.22
idf-component-manager>=0.2.99-beta
gdbgui==0.13.2.0
pygdbmi<=0.9.0.2
reedsolo>=1.5.3,<=1.5.4
Expand Down