From 2399128500f46d8cf9b7881279f2354b4bc56da6 Mon Sep 17 00:00:00 2001 From: Fu Hanxi Date: Fri, 19 Feb 2021 17:09:51 +0800 Subject: [PATCH 1/3] ci: improve docs pattern from Kconfig to Kconfig* for example: Kconfig.spiram.common will now be included --- .gitlab/ci/rules.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml index aacc79e126..ffc1533807 100644 --- a/.gitlab/ci/rules.yml +++ b/.gitlab/ci/rules.yml @@ -5,7 +5,7 @@ - ".gitlab/ci/docs.yml" - "docs/**/*" - "components/**/*.h" - - "components/**/Kconfig" + - "components/**/Kconfig*" - "components/**/CMakeList.txt" - "components/**/sdkconfig*" - "tools/kconfig_new/**/*" From 4c1fca4a77ab83c3adfdeef697bc6dc4df75a80c Mon Sep 17 00:00:00 2001 From: Fu Hanxi Date: Fri, 19 Feb 2021 17:28:09 +0800 Subject: [PATCH 2/3] ci(rules): improve docs related jobs rules - build_docs_pdf: now ignore docs related file patterns - deploy_docs_preview: now ignore docs related file patterns - .rules:build:docs: related jobs will not be triggered with `build` label --- .gitlab/ci/dependencies/dependencies.yml | 9 ++++++-- .gitlab/ci/docs.yml | 3 ++- .gitlab/ci/rules.yml | 28 +++++++++++++----------- 3 files changed, 24 insertions(+), 16 deletions(-) diff --git a/.gitlab/ci/dependencies/dependencies.yml b/.gitlab/ci/dependencies/dependencies.yml index 0a1a48dcda..24a33273d6 100644 --- a/.gitlab/ci/dependencies/dependencies.yml +++ b/.gitlab/ci/dependencies/dependencies.yml @@ -49,15 +49,20 @@ "build:docs": labels: - - build - docs - build_docs # for backward compatibility patterns: - docs deploy: - - preview - production +"build:docs:label-only": + labels: + - docs + - build_docs # for backward compatibility + deploy: + - preview + "build": labels: - build diff --git a/.gitlab/ci/docs.yml b/.gitlab/ci/docs.yml index 0961222355..d128ff4e45 100644 --- a/.gitlab/ci/docs.yml +++ b/.gitlab/ci/docs.yml @@ -68,6 +68,7 @@ build_docs_html: build_docs_pdf: extends: - .build_docs_build_stage_template + - .rules:build:docs:label-only artifacts: when: always paths: @@ -97,7 +98,7 @@ build_docs_pdf: deploy_docs_preview: extends: - .deploy_docs_template - - .rules:build:docs-preview + - .rules:build:docs:label-only-preview dependencies: # set dependencies to null to avoid missing artifacts issue needs: - build_docs_html diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml index ffc1533807..04dce56a27 100644 --- a/.gitlab/ci/rules.yml +++ b/.gitlab/ci/rules.yml @@ -565,19 +565,6 @@ .rules:build:docs: rules: - <<: *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-title-build_docs - <<: *if-label-docs @@ -589,6 +576,21 @@ rules: - <<: *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: - <<: *if-protected From 7742f1e135ba3da33809f12d04d6262f6df6d5a0 Mon Sep 17 00:00:00 2001 From: Fu Hanxi Date: Fri, 19 Feb 2021 17:42:48 +0800 Subject: [PATCH 3/3] ci(docs): fix missing build doc for target esp32c3 --- .gitlab/ci/docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab/ci/docs.yml b/.gitlab/ci/docs.yml index d128ff4e45..e66fbeb133 100644 --- a/.gitlab/ci/docs.yml +++ b/.gitlab/ci/docs.yml @@ -28,7 +28,7 @@ check_docs_lang_sync: parallel: matrix: - DOCLANG: ["en", "zh_CN"] - DOCTGT: ["esp32", "esp32s2"] + DOCTGT: ["esp32", "esp32s2", "esp32c3"] check_docs_gh_links: extends: