From 4dc1801c7a1382b4877dff3f6c0d342914f22509 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Fri, 9 Jul 2021 01:50:28 +0200 Subject: [PATCH] ci: install CMake version from tools.json in espcoredump test To help achieve reproducible builds. --- .gitlab-ci.yml | 2 +- tools/ci/config/host-test.yml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0ae550b60d..13fc4a248a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -70,7 +70,7 @@ variables: export IDF_MIRROR_PREFIX_MAP= fi if [[ "$SETUP_TOOLS" == "1" || "$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 ${SETUP_TOOLS_LIST:-} && eval "$(tools/idf_tools.py --non-interactive export)" || exit 1 fi before_script: diff --git a/tools/ci/config/host-test.yml b/tools/ci/config/host-test.yml index a306767b95..73e6f9cb79 100644 --- a/tools/ci/config/host-test.yml +++ b/tools/ci/config/host-test.yml @@ -255,6 +255,9 @@ test_espcoredump: - components/espcoredump/test/.coverage - components/espcoredump/test/output expire_in: 1 week + variables: + # install CMake version specified in tools.json + SETUP_TOOLS_LIST: "all" script: - cd components/espcoredump/test/ - ${IDF_PATH}/tools/ci/multirun_with_pyenv.sh ./test_espcoredump.sh