Skip to content

Commit e58a21b

Browse files
committed
fix checkout of change at tag
1 parent 8d66297 commit e58a21b

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ COPY_OUT=0
1717
DEPLOY_OUT=0
1818

1919
function print_help() {
20-
echo "Usage: build.sh [-s] [-A <arduino_branch>] [-I <idf_branch>] [-i <idf_commit>] [-c <path>] [-t <target>] [-b <build|menuconfig|idf_libs|copy_bootloader|mem_variant>] [config ...]"
20+
echo "Usage: build.sh [-s] [-A <arduino_branch>] [-a <arduino_tag>] [-I <idf_branch>] [-i <idf_commit>] [-c <path>] [-t <target>] [-b <build|menuconfig|idf_libs|copy_bootloader|mem_variant>] [config ...]"
2121
echo " -s Skip installing/updating of ESP-IDF and all components"
2222
echo " -A Set which branch of arduino-esp32 to be used for compilation"
2323
echo " -a Set which tag of arduino-esp32 to be used for compilation"
@@ -31,7 +31,7 @@ function print_help() {
3131
exit 1
3232
}
3333

34-
while getopts ":A:I:i:c:t:b:sd" opt; do
34+
while getopts ":A:a:I:i:c:t:b:sd" opt; do
3535
case ${opt} in
3636
s )
3737
SKIP_ENV=1

tools/update-components.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,7 @@ if [ "$AR_TAG" ]; then
5757
if [ "$AR_BRANCH" ]; then
5858
echo "Warning: Both branch and tag specifiied for arduino-esp32. Tag takes precedence. Ignoring branch."
5959
fi
60-
git -C "$AR_COMPS/arduino" checkout "tags/$AR_TAG" && \
61-
git -C "$AR_COMPS/arduino" fetch && \
62-
git -C "$AR_COMPS/arduino" pull --ff-only
60+
git -C "$AR_COMPS/arduino" checkout "tags/$AR_TAG"
6361
fi
6462
if [ $? -ne 0 ]; then exit 1; fi
6563

0 commit comments

Comments
 (0)