From b4e8e9c8457f5233780dee51dcac879cce00a387 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 +- .gitlab/ci/host-test.yml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 13fb5243b9..4a57cdb4c6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -66,7 +66,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 if [[ ! -z "$OOCD_DISTRO_URL" && "$CI_JOB_STAGE" == "target_test" ]]; then echo "Using custom OpenOCD from ${OOCD_DISTRO_URL}" wget $OOCD_DISTRO_URL diff --git a/.gitlab/ci/host-test.yml b/.gitlab/ci/host-test.yml index bb1f061ff9..81a930c66e 100644 --- a/.gitlab/ci/host-test.yml +++ b/.gitlab/ci/host-test.yml @@ -260,6 +260,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/ - ./test_espcoredump.sh