Skip to content

Commit 958f8b0

Browse files
authored
Merge branch 'master' into release/v5.3
2 parents 807bddb + f488f41 commit 958f8b0

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Diff for: configs/pio_start.txt

-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ if "ZIGBEE_MODE_ZCZR" in flatten_cppdefines:
4747
LIBS=[
4848
"-lesp_zb_api_zczr",
4949
"-lesp_zb_cli_command",
50-
"-lzboss_stack.zczr.trace",
5150
"-lzboss_stack.zczr",
5251
"-lzboss_port"
5352
]
@@ -57,7 +56,6 @@ if "ZIGBEE_MODE_ED" in flatten_cppdefines:
5756
LIBS=[
5857
"-lesp_zb_api_ed",
5958
"-lesp_zb_cli_command",
60-
"-lzboss_stack.ed.trace",
6159
"-lzboss_stack.ed",
6260
"-lzboss_port"
6361
]

Diff for: tools/install-arduino.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ fi
4141

4242
if [ "$AR_BRANCH" ]; then
4343
echo "AR_BRANCH='$AR_BRANCH'"
44+
git -C "$AR_COMPS/arduino" fetch --all && \
4445
git -C "$AR_COMPS/arduino" checkout "$AR_BRANCH" && \
45-
git -C "$AR_COMPS/arduino" fetch && \
4646
git -C "$AR_COMPS/arduino" pull --ff-only
4747
fi
4848
if [ $? -ne 0 ]; then exit 1; fi

Diff for: tools/install-esp-idf.sh

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ if [ ! -d "$IDF_PATH" ]; then
1717
idf_was_installed="1"
1818
fi
1919

20+
git -C "$IDF_PATH" fetch --all --tags
21+
2022
if [ "$IDF_TAG" ]; then
2123
git -C "$IDF_PATH" checkout "tags/$IDF_TAG"
2224
idf_was_installed="1"

0 commit comments

Comments
 (0)