Merge branch 'ci/improve_docs_rules_dependencies' into 'master'

CI: improve docs rules dependencies

See merge request espressif/esp-idf!12419
This commit is contained in:
Angus Gratton
2021-02-22 02:47:29 +00:00
3 changed files with 26 additions and 18 deletions

View File

@@ -49,15 +49,20 @@
"build:docs": "build:docs":
labels: labels:
- build
- docs - docs
- build_docs # for backward compatibility - build_docs # for backward compatibility
patterns: patterns:
- docs - docs
deploy: deploy:
- preview
- production - production
"build:docs:label-only":
labels:
- docs
- build_docs # for backward compatibility
deploy:
- preview
"build": "build":
labels: labels:
- build - build

View File

@@ -28,7 +28,7 @@ check_docs_lang_sync:
parallel: parallel:
matrix: matrix:
- DOCLANG: ["en", "zh_CN"] - DOCLANG: ["en", "zh_CN"]
DOCTGT: ["esp32", "esp32s2"] DOCTGT: ["esp32", "esp32s2", "esp32c3"]
check_docs_gh_links: check_docs_gh_links:
extends: extends:
@@ -68,6 +68,7 @@ build_docs_html:
build_docs_pdf: build_docs_pdf:
extends: extends:
- .build_docs_build_stage_template - .build_docs_build_stage_template
- .rules:build:docs:label-only
artifacts: artifacts:
when: always when: always
paths: paths:
@@ -97,7 +98,7 @@ build_docs_pdf:
deploy_docs_preview: deploy_docs_preview:
extends: extends:
- .deploy_docs_template - .deploy_docs_template
- .rules:build:docs-preview - .rules:build:docs:label-only-preview
dependencies: # set dependencies to null to avoid missing artifacts issue dependencies: # set dependencies to null to avoid missing artifacts issue
needs: needs:
- build_docs_html - build_docs_html

View File

@@ -5,7 +5,7 @@
- ".gitlab/ci/docs.yml" - ".gitlab/ci/docs.yml"
- "docs/**/*" - "docs/**/*"
- "components/**/*.h" - "components/**/*.h"
- "components/**/Kconfig" - "components/**/Kconfig*"
- "components/**/CMakeList.txt" - "components/**/CMakeList.txt"
- "components/**/sdkconfig*" - "components/**/sdkconfig*"
- "tools/kconfig_new/**/*" - "tools/kconfig_new/**/*"
@@ -565,19 +565,6 @@
.rules:build:docs: .rules:build:docs:
rules: rules:
- <<: *if-protected - <<: *if-protected
- <<: *if-label-build
- <<: *if-title-build
- <<: *if-label-build_docs
- <<: *if-title-build_docs
- <<: *if-label-docs
- <<: *if-title-docs
- <<: *if-dev-push
changes: *patterns-docs
.rules:build:docs-preview:
rules:
- <<: *if-label-build
- <<: *if-title-build
- <<: *if-label-build_docs - <<: *if-label-build_docs
- <<: *if-title-build_docs - <<: *if-title-build_docs
- <<: *if-label-docs - <<: *if-label-docs
@@ -589,6 +576,21 @@
rules: rules:
- <<: *if-protected-no_label - <<: *if-protected-no_label
.rules:build:docs:label-only:
rules:
- <<: *if-protected
- <<: *if-label-build_docs
- <<: *if-title-build_docs
- <<: *if-label-docs
- <<: *if-title-docs
.rules:build:docs:label-only-preview:
rules:
- <<: *if-label-build_docs
- <<: *if-title-build_docs
- <<: *if-label-docs
- <<: *if-title-docs
.rules:build:example_test-esp32: .rules:build:example_test-esp32:
rules: rules:
- <<: *if-protected - <<: *if-protected