File tree 3 files changed +10
-4
lines changed
3 files changed +10
-4
lines changed Original file line number Diff line number Diff line change 1
1
#! /bin/bash
2
2
3
- IDF_COMMIT=$( git -C " $IDF_PATH " rev-parse --short HEAD)
4
- IDF_BRANCH=$( git -C " $IDF_PATH " symbolic-ref --short HEAD)
3
+ IDF_COMMIT=$( git -C " $IDF_PATH " rev-parse --short HEAD || echo " " )
4
+ IDF_BRANCH=$( git -C " $IDF_PATH " symbolic-ref --short HEAD || echo " " )
5
5
6
6
idf_version_string=${IDF_BRANCH// \/ / _} " -$IDF_COMMIT "
7
7
archive_path=" dist/arduino-esp32-libs-$idf_version_string .tar.gz"
Original file line number Diff line number Diff line change @@ -18,3 +18,4 @@ if [ ! -e "tools/esptool" ]; then
18
18
git clone https://github.com/espressif/esptool tools/esptool
19
19
fi
20
20
./tools/esptool/esptool.py --chip " $IDF_TARGET " elf2image --dont-append-digest " build/bootloader/bootloader.elf" -o " $AR_SDK /bin/bootloader_$BOOTCONF .bin"
21
+ cp " build/bootloader/bootloader.elf" " $AR_SDK /bin/bootloader_$BOOTCONF .elf"
Original file line number Diff line number Diff line change @@ -28,9 +28,14 @@ if [ -z $AR_BRANCH ]; then
28
28
if [[ " $current_branch " != " master" && ` git_branch_exists " $AR_COMPS /arduino" " $current_branch " ` == " 1" ]]; then
29
29
export AR_BRANCH=" $current_branch "
30
30
else
31
- has_ar_branch=` git_branch_exists " $AR_COMPS /arduino" " idf-$IDF_BRANCH " `
31
+ if [ -z " $IDF_COMMIT " ]; then # commit was not specified at build time
32
+ AR_BRANCH_NAME=" idf-$IDF_BRANCH "
33
+ else
34
+ AR_BRANCH_NAME=" idf-$IDF_COMMIT "
35
+ fi
36
+ has_ar_branch=` git_branch_exists " $AR_COMPS /arduino" " $AR_BRANCH_NAME " `
32
37
if [ " $has_ar_branch " == " 1" ]; then
33
- export AR_BRANCH=" idf- $IDF_BRANCH "
38
+ export AR_BRANCH=" $AR_BRANCH_NAME "
34
39
else
35
40
has_ar_branch=` git_branch_exists " $AR_COMPS /arduino" " $AR_PR_TARGET_BRANCH " `
36
41
if [ " $has_ar_branch " == " 1" ]; then
You can’t perform that action at this time.
0 commit comments