File tree Expand file tree Collapse file tree 2 files changed +3
-5
lines changed Expand file tree Collapse file tree 2 files changed +3
-5
lines changed Original file line number Diff line number Diff line change @@ -17,7 +17,7 @@ COPY_OUT=0
17
17
DEPLOY_OUT=0
18
18
19
19
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 ...]"
21
21
echo " -s Skip installing/updating of ESP-IDF and all components"
22
22
echo " -A Set which branch of arduino-esp32 to be used for compilation"
23
23
echo " -a Set which tag of arduino-esp32 to be used for compilation"
@@ -31,7 +31,7 @@ function print_help() {
31
31
exit 1
32
32
}
33
33
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
35
35
case ${opt} in
36
36
s )
37
37
SKIP_ENV=1
Original file line number Diff line number Diff line change @@ -57,9 +57,7 @@ if [ "$AR_TAG" ]; then
57
57
if [ " $AR_BRANCH " ]; then
58
58
echo " Warning: Both branch and tag specifiied for arduino-esp32. Tag takes precedence. Ignoring branch."
59
59
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 "
63
61
fi
64
62
if [ $? -ne 0 ]; then exit 1; fi
65
63
You can’t perform that action at this time.
0 commit comments