Merge branch 'bugfix/ci_tag_for_cmake_linter_v3.2' into 'release/v3.2'

ci: A small CI stabilizing fix (backport v3.2)

See merge request idf/esp-idf!4710
This commit is contained in:
Jiang Jiang Jian 2019-04-14 02:55:38 +08:00
commit f77d0a9cdb

View file

@ -384,9 +384,17 @@ build_docs:
- make html
- ../check_doc_warnings.sh
verify_cmake_style:
stage: build
.check_job_template: &check_job_template
stage: check
image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG
tags:
- host_test
dependencies: []
before_script: *do_nothing_before_no_filter
verify_cmake_style:
<<: *check_job_template
stage: build
only:
variables:
- $BOT_TRIGGER_WITH_LABEL == null
@ -677,14 +685,6 @@ check_doc_links:
- cd docs
- make linkcheck
.check_job_template: &check_job_template
stage: check
image: $CI_DOCKER_REGISTRY/esp32-ci-env$BOT_DOCKER_IMAGE_TAG
tags:
- build
dependencies: []
before_script: *do_nothing_before_no_filter
check_line_endings:
<<: *check_job_template
script: