Просмотр исходного кода

ci: install CMake version from tools.json in espcoredump test

To help achieve reproducible builds.
Ivan Grokhotkov 4 лет назад
Родитель
Сommit
b4e8e9c845
2 измененных файлов с 4 добавлено и 1 удалено
  1. 1 1
      .gitlab-ci.yml
  2. 3 0
      .gitlab/ci/host-test.yml

+ 1 - 1
.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

+ 3 - 0
.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