8000 Merge branch 'master' of github.com:espressif/esp32-arduino-lib-build… · rvbc1/esp32-arduino-lib-builder@febf9bc · GitHub
[go: up one dir, main page]
Skip to content

Commit febf9bc

Browse files
rvbc1rvbc1
committed
Merge branch 'master' of github.com:espressif/esp32-arduino-lib-builder into aflx4
2 parents dc04da7 + bb76cb1 commit febf9bc

File tree

8 files changed

+42
-29
lines changed

8 files changed

+42
-29
lines changed

‎.github/workflows/cron_build.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ jobs:
4141
deploy_needed: ${{ steps.check.outputs.deploy_needed }}
4242
targets_list: ${{ steps.check.outputs.targets_list }}
4343
steps:
44-
- uses: actions/checkout@v4
44+
- name: Checkout ${{ inputs.lib_builder_branch }}
45+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4546
with:
4647
ref: ${{ inputs.lib_builder_branch }}
4748

@@ -65,7 +66,8 @@ jobs:
6566
matrix:
6667
target: ${{ fromJson(needs.check-if-needed.outputs.targets_list) }}
6768
steps:
68-
- uses: actions/checkout@v4
69+
- name: Checkout ${{ inputs.lib_builder_branch }}
70+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
6971
with:
7072
ref: ${{ inputs.lib_builder_branch }}
7173

@@ -88,13 +90,13 @@ jobs:
8890
8991
- name: Upload build
9092
if: failure()
91-
uses: actions/upload-artifact@v4
93+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
9294
with:
9395
name: build-${{ env.libs_branch }}-${{ matrix.target }}
9496
path: build
9597

9698
- name: Upload library files
97-
uses: actions/upload-artifact@v4
99+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
98100
with:
99101
name: libs-${{ env.libs_branch }}-${{ matrix.target }}
100102
path: dist
@@ -105,7 +107,8 @@ jobs:
105107
needs: [check-if-needed, build-libs]
106108
if: needs.check-if-needed.outputs.deploy_needed == '1'
107109
steps:
108-
- uses: actions/checkout@v4
110+
- name: Checkout ${{ inputs.lib_builder_branch }}
111+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
109112
with:
110113
ref: ${{ inputs.lib_builder_branch }}
111114

@@ -115,7 +118,7 @@ jobs:
115118
echo "libs_branch=${branch//\//_}" >> $GITHUB_ENV
116119
117120
- name: Download artifacts
118-
uses: actions/download-artifact@v4
121+
uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
119122
with:
120123
path: dist
121124
pattern: libs-${{ env.libs_branch }}-*
@@ -125,7 +128,7 @@ jobs:
125128
run: bash ./tools/combine-artifacts.sh
126129

127130
- name: Upload full esp32-arduino-libs archive
128-
uses: actions/upload-artifact@v4
131+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
129132
with:
130133
name: esp32-arduino-libs-${{ env.libs_branch }}
131134
path: dist/esp32-arduino-libs.zip
@@ -154,7 +157,7 @@ jobs:
154157
bash ./tools/push-to-arduino.sh
155158
156159
- name: Upload package_esp32_index.template.json
157-
uses: actions/upload-artifact@v4
160+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
158161
with:
159162
name: package-esp32-index-json-${{ env.libs_branch }}
160163
path: out/package_esp32_index.template.json

‎.github/workfl 628C ows/docker.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,23 +66,23 @@ jobs:
6666
echo "URL: $URL"
6767
6868
- name: Checkout
69-
uses: actions/checkout@v4
69+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
7070

7171
- name: Login to Docker Hub
7272
if: ${{ github.event_name == 'push' }}
73-
uses: docker/login-action@v3
73+
uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
7474
with:
7575
username: ${{ secrets.DOCKERHUB_USERNAME }}
7676
password: ${{ secrets.DOCKERHUB_TOKEN }}
7777

7878
- name: Set up QEMU for multiarch builds
79-
uses: docker/setup-qemu-action@v3
79+
uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
8080

8181
- name: Set up Docker Buildx
82-
uses: docker/setup-buildx-action@v3
82+
uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3.10.0
8383

8484
- name: Build and push
85-
uses: docker/build-push-action@v5
85+
uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
8686
with:
8787
context: tools/docker
8888
push: ${{ github.event_name == 'push' }}
@@ -94,7 +94,7 @@ jobs:
9494
9595
- name: Update Docker Hub repository description (master branch)
9696
if: ${{ github.event_name == 'push' && github.ref_type == 'branch' && github.ref_name == 'master' }}
97-
uses: peter-evans/dockerhub-description@v4
97+
uses: peter-evans/dockerhub-description@e98e4d1628a5f3be2be7c231e50981aee98723ae # v4.0.0
9898
with:
9999
username: ${{ secrets.DOCKERHUB_USERNAME }}
100100
password: ${{ secrets.DOCKERHUB_TOKEN }}

‎.github/workflows/push.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ jobs:
2929
target: [esp32, esp32s2, esp32s3, esp32c2, esp32c3, esp32c6, esp32h2, esp32p4]
3030
fail-fast: false
3131
steps:
32-
- uses: actions/checkout@v4
32+
- name: Checkout repository
33+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3334

3435
- name: Install dependencies
3536
run: bash ./tools/prepare-ci.sh
@@ -39,13 +40,13 @@ jobs:
3940

4041
- name: Upload build
4142
if: failure()
42-
uses: actions/upload-artifact@v4
43+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
4344
with:
4445
name: build-${{ matrix.target }}
4546
path: build
4647

4748
- name: Upload archive
48-
uses: actions/upload-artifact@v4
49+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
4950
with:
5051
name: artifacts-${{ matrix.target }}
5152
path: dist
@@ -56,7 +57,7 @@ jobs:
5657
runs-on: ubuntu-latest
5758
steps:
5859
- name: Download artifacts
59-
uses: actions/download-artifact@v4
60+
uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
6061
with:
6162
path: dist
6263
pattern: artifacts-*
@@ -70,13 +71,13 @@ jobs:
7071
cp out/package_esp32_index.template.json dist/package_esp32_index.template.json
7172
7273
- name: Upload full esp32-arduino-libs archive
73-
uses: actions/upload-artifact@v4
74+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
7475
with:
7576
name: esp32-arduino-libs
7677
path: dist/esp32-arduino-libs.tar.gz
7778

7879
- name: Upload package_esp32_index.template.json
79-
uses: actions/upload-artifact@v4
80+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
8081
with:
8182
name: package-esp32-index-json
8283
path: dist/package_esp32_index.template.json

‎.github/workflows/repository_dispatch.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,30 @@ jobs:
77
name: Dispatch Event
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v4
10+
- name: Checkout repository
11+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1112
with:
1213
fetch-depth: 0
14+
1315
- name: Install dependencies
1416
run: bash ./tools/prepare-ci.sh
17+
1518
- name: Handle Event
1619
env:
1720
GITHUB_TOKEN: ${{ secrets.PUSH_TOKEN }}
1821
GIT_AUTHOR_EMAIL: ${{ secrets.PUSH_EMAIL }}
1922
GIT_COMMITTER_EMAIL: ${{ secrets.PUSH_EMAIL }}
2023
run: bash ./tools/repository_dispatch.sh
24+
2125
- name: Upload build
2226
if: failure()
23-
uses: actions/upload-artifact@v4
27+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
2428
with:
2529
name: build
2630
path: build
31+
2732
- name: Upload archive
28-
uses: actions/upload-artifact@v4
33+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
2934
with:
3035
name: artifacts
3136
path: dist

‎CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@ idf_build_set_property(COMPILE_DEFINITIONS "-DESP32_ARDUINO_LIB_BUILDER" APPEND)
3939
##################
4040
### ESP Matter ###
4141
##################
42-
idf_build_set_property(CXX_COMPILE_OPTIONS "-std=gnu++17;-DCHIP_HAVE_CONFIG_H" APPEND)
42+
idf_build_set_property(CXX_COMPILE_OPTIONS "-std=gnu++2a;-DCHIP_HAVE_CONFIG_H" APPEND)

‎configs/defconfig.common

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ CONFIG_LWIP_HOOK_IP6_ROUTE_DEFAULT=y
7878
CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT=y
7979
CONFIG_LWIP_HOOK_IP6_SELECT_SRC_ADDR_DEFAULT=y
8080
CONFIG_LWIP_HOOK_NETCONN_EXT_RESOLVE_DEFAULT=y
81-
CONFIG_LWIP_HOOK_IP6_INPUT_CUSTOM=y
8281
CONFIG_LWIP_MULTICAST_PING=y
8382
CONFIG_LWIP_BROADCAST_PING=y
8483
CONFIG_LWIP_IPV6_NUM_ADDRESSES=8
@@ -121,6 +120,7 @@ CONFIG_ESP_COREDUMP_STACK_SIZE=0
121120
CONFIG_MBEDTLS_DYNAMIC_BUFFER=y
122121
CONFIG_MBEDTLS_DYNAMIC_FREE_PEER_CERT=y
123122
CONFIG_MBEDTLS_DYNAMIC_FREE_CONFIG_DATA=y
123+
CONFIG_I2S_ISR_IRAM_SAFE=y
124124
#
125125
# Matter Settings
126126
#
@@ -134,6 +134,9 @@ CONFIG_ESP_MATTER_NVS_USE_COMPACT_ATTR_STORAGE=y
134134

135135
#TinyUSB Config
136136
CONFIG_TINYUSB_CDC_MAX_PORTS=2
137+
CONFIG_USB_HOST_HUBS_SUPPORTED=y
138+
CONFIG_USB_HOST_HUB_MULTI_LEVEL=y
139+
CONFIG_USB_HOST_HW_BUFFER_BIAS_PERIODIC_OUT=y
137140

138141
# Zigbee Config
139142
CONFIG_ZB_ENABLED=y

‎main/idf_component.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dependencies:
1717
rules:
1818
- if: "target in [esp32s3]"
1919
espressif/esp_matter:
20-
version: "^1.3.0"
20+
version: "^1.4.0"
2121
require: public
2222
rules:
2323
- if: "target not in [esp32c2, esp32h2, esp32p4]"

‎tools/copy-libs.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -525,9 +525,10 @@ for flag_file in "c_flags" "cpp_flags" "S_flags"; do
525525
sed 's/\\\"-DCHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER=<lib\/address_resolve\/AddressResolve_DefaultImpl.h>\\\"/-DCHIP_HAVE_CONFIG_H/' $FLAGS_DIR/$flag_file > $FLAGS_DIR/$flag_file.temp
526526
mv $FLAGS_DIR/$flag_file.temp $FLAGS_DIR/$flag_file
527527
done
528-
CHIP_RESOLVE_DIR="$AR_SDK/include/espressif__esp_matter/connectedhomeip/connectedhomeip/src/lib/address_resolve"
529-
sed 's/CHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER/<lib\/address_resolve\/AddressResolve_DefaultImpl.h>/' $CHIP_RESOLVE_DIR/AddressResolve.h > $CHIP_RESOLVE_DIR/AddressResolve_temp.h
530-
mv $CHIP_RESOLVE_DIR/AddressResolve_temp.h $CHIP_RESOLVE_DIR/AddressResolve.h
528+
# this is not necessary for Matter 1.4, but it is for Matter 1.3
529+
#CHIP_RESOLVE_DIR="$AR_SDK/include/espressif__esp_matter/connectedhomeip/connectedhomeip/src/lib/address_resolve"
530+
#sed 's/CHIP_ADDRESS_RESOLVE_IMPL_INCLUDE_HEADER/<lib\/address_resolve\/AddressResolve_DefaultImpl.h>/' $CHIP_RESOLVE_DIR/AddressResolve.h > $CHIP_RESOLVE_DIR/AddressResolve_temp.h
531+
#mv $CHIP_RESOLVE_DIR/AddressResolve_temp.h $CHIP_RESOLVE_DIR/AddressResolve.h
531532
# End of Matter Library adjustments
532533

533534
# sdkconfig

0 commit comments

Comments
 (0)
0