Merge branch 'bugfix/shell_exit' into 'master'
scripts: Fix shell exit See merge request idf/esp-idf!3908
This commit is contained in:
commit
812a49bd0d
|
@ -583,9 +583,9 @@ test_esp_err_to_name_on_host:
|
||||||
script:
|
script:
|
||||||
- cd ${IDF_PATH}/tools/
|
- cd ${IDF_PATH}/tools/
|
||||||
- ${IDF_PATH}/tools/ci/multirun_with_pyenv.sh -p 2.7.15 ./gen_esp_err_to_name.py
|
- ${IDF_PATH}/tools/ci/multirun_with_pyenv.sh -p 2.7.15 ./gen_esp_err_to_name.py
|
||||||
- git diff --exit-code -- ../components/esp32/esp_err_to_name.c || (echo 'Differences found. Please run gen_esp_err_to_name.py and commit the changes.'; exit 1)
|
- git diff --exit-code -- ../components/esp32/esp_err_to_name.c || { echo 'Differences found. Please run gen_esp_err_to_name.py and commit the changes.'; exit 1; }
|
||||||
- ${IDF_PATH}/tools/ci/multirun_with_pyenv.sh -p 3.4.8 ./gen_esp_err_to_name.py
|
- ${IDF_PATH}/tools/ci/multirun_with_pyenv.sh -p 3.4.8 ./gen_esp_err_to_name.py
|
||||||
- git diff --exit-code -- ../components/esp32/esp_err_to_name.c || (echo 'Differences found between running under Python 2 and 3.'; exit 1)
|
- git diff --exit-code -- ../components/esp32/esp_err_to_name.c || { echo 'Differences found between running under Python 2 and 3.'; exit 1; }
|
||||||
|
|
||||||
test_espcoredump:
|
test_espcoredump:
|
||||||
<<: *host_test_template
|
<<: *host_test_template
|
||||||
|
|
|
@ -570,8 +570,8 @@ define GenerateSubmoduleCheckTarget
|
||||||
check-submodules: $(IDF_PATH)/$(1)/.git
|
check-submodules: $(IDF_PATH)/$(1)/.git
|
||||||
$(IDF_PATH)/$(1)/.git:
|
$(IDF_PATH)/$(1)/.git:
|
||||||
@echo "WARNING: Missing submodule $(1)..."
|
@echo "WARNING: Missing submodule $(1)..."
|
||||||
[ -e ${IDF_PATH}/.git ] || ( echo "ERROR: esp-idf must be cloned from git to work."; exit 1)
|
[ -e ${IDF_PATH}/.git ] || { echo "ERROR: esp-idf must be cloned from git to work."; exit 1; }
|
||||||
[ -x "$(shell which git)" ] || ( echo "ERROR: Need to run 'git submodule init $(1)' in esp-idf root directory."; exit 1)
|
[ -x "$(shell which git)" ] || { echo "ERROR: Need to run 'git submodule init $(1)' in esp-idf root directory."; exit 1; }
|
||||||
@echo "Attempting 'git submodule update --init $(1)' in esp-idf root directory..."
|
@echo "Attempting 'git submodule update --init $(1)' in esp-idf root directory..."
|
||||||
cd ${IDF_PATH} && git submodule update --init $(1)
|
cd ${IDF_PATH} && git submodule update --init $(1)
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,7 @@ function assert_branch_public()
|
||||||
set -e
|
set -e
|
||||||
source ./configure_ci_environment.sh
|
source ./configure_ci_environment.sh
|
||||||
[[ $IS_PUBLIC = $2 ]] || exit 1
|
[[ $IS_PUBLIC = $2 ]] || exit 1
|
||||||
) || ( echo "Expected $1 public=$2. Failing" && exit 1 )
|
) || { echo "Expected $1 public=$2. Failing"; exit 1; }
|
||||||
}
|
}
|
||||||
|
|
||||||
assert_branch_public master 1
|
assert_branch_public master 1
|
||||||
|
|
Loading…
Reference in a new issue