Merge branch 'bugfix/ci_tag_for_cmake_linter' into 'master'

ci: A small CI stabilizing fix

See merge request idf/esp-idf!3801
This commit is contained in:
Anton Maklakov 2018-12-07 02:39:51 +08:00
commit e224b8a43a

View File

@ -385,9 +385,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
@ -685,14 +693,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: