mirror of
https://github.com/espressif/esp-idf.git
synced 2024-10-05 20:47:46 -04:00
Merge branch 'bugfix/target_test_no_setup_tools' into 'master'
ci: don't do idf_tools.py install in target_test stage See merge request idf/esp-idf!5158
This commit is contained in:
commit
54c70dc284
@ -73,8 +73,10 @@ variables:
|
|||||||
echo "Cleaning up $CUSTOM_TOOLCHAIN_PATH"
|
echo "Cleaning up $CUSTOM_TOOLCHAIN_PATH"
|
||||||
rm -rf "$CUSTOM_TOOLCHAIN_PATH"
|
rm -rf "$CUSTOM_TOOLCHAIN_PATH"
|
||||||
|
|
||||||
.setup_tools: &setup_tools |
|
.setup_tools_unless_target_test: &setup_tools_unless_target_test |
|
||||||
|
if [ "$CI_JOB_STAGE" != "target_test" ]; then
|
||||||
tools/idf_tools.py --non-interactive install && eval "$(tools/idf_tools.py --non-interactive export)" || exit 1
|
tools/idf_tools.py --non-interactive install && eval "$(tools/idf_tools.py --non-interactive export)" || exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
- source tools/ci/setup_python.sh
|
- source tools/ci/setup_python.sh
|
||||||
@ -94,7 +96,7 @@ before_script:
|
|||||||
# (the same regular expressions are used to set these are used in 'only:' sections below
|
# (the same regular expressions are used to set these are used in 'only:' sections below
|
||||||
- source tools/ci/configure_ci_environment.sh
|
- source tools/ci/configure_ci_environment.sh
|
||||||
|
|
||||||
- *setup_tools
|
- *setup_tools_unless_target_test
|
||||||
|
|
||||||
- *setup_custom_toolchain
|
- *setup_custom_toolchain
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user