Skip to content

Commit df3c58b

Browse files
committed
ci: fix tools installation in test_app build
1 parent e57f3c1 commit df3c58b

File tree

1 file changed

+2
-11
lines changed

1 file changed

+2
-11
lines changed

.gitlab/ci/downstream/build-test-app-template.yml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -56,17 +56,8 @@
5656
pyenv global $(pyenv versions --bare)
5757
fi
5858
# Install tools
59-
${IDF_PATH}/tools/idf_tools.py install-python-env
60-
if [ -n "${TEST_APP_BUILD_TOOLCHAIN_PREFIX:-}" ]; then
61-
echo "TEST_APP_BUILD_TOOLCHAIN_PREFIX=$TEST_APP_BUILD_TOOLCHAIN_PREFIX"
62-
${IDF_PATH}/tools/idf_tools.py install ${TEST_APP_BUILD_TOOLCHAIN_PREFIX}-elf
63-
else
64-
${IDF_PATH}/tools/idf_tools.py install ${TOOLCHAIN_PREFIX}-elf
65-
fi
66-
# cannot exec '. ${IDF_PATH}/export.sh' here because not all tools distros are presented
67-
# in the image and `export.sh` fails w/o adding tools to $PATH
68-
idf_exports=$(${IDF_PATH}/tools/idf_tools.py export) || true
69-
eval "${idf_exports}"
59+
${IDF_PATH}/install.sh
60+
. ${IDF_PATH}/export.sh
7061
popd
7162
fi
7263
idf.py --version || true

0 commit comments

Comments
 (0)