espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-03 20:54:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/docs_push_production_without_push_to_github' into 'master'

Browse Source 
bugfix: Run `deploy_docs_production` in `post_deploy` stage after `push_to_github` successfully

See merge request espressif/esp-idf!11028
This commit is contained in:
Angus Gratton
2020-10-29 15:18:01 +08:00
parent 8f3393afdf 78134907a2
commit 654a827d7b
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tools/ci/config/deploy.yml
View File

@@ -59,9 +59,6 @@ push_to_github:
tags: tags:
- deploy - deploy
- shiny - shiny
needs:
- build_docs_html
- build_docs_pdf
variables: variables:
DOCS_BUILD_DIR: "${IDF_PATH}/docs/_build/" DOCS_BUILD_DIR: "${IDF_PATH}/docs/_build/"
PYTHONUNBUFFERED: 1 PYTHONUNBUFFERED: 1
@@ -77,6 +74,9 @@ deploy_docs_preview:
- .rules:labels:build_docs-slim - .rules:labels:build_docs-slim
# Override default stage to happen before the post_check # Override default stage to happen before the post_check
stage: test_deploy stage: test_deploy
needs:
- build_docs_html
- build_docs_pdf
variables: variables:
TYPE: "preview" TYPE: "preview"
# older branches use DOCS_DEPLOY_KEY, DOCS_SERVER, DOCS_SERVER_USER, DOCS_PATH for preview server so we keep these names for 'preview' # older branches use DOCS_DEPLOY_KEY, DOCS_SERVER, DOCS_SERVER_USER, DOCS_PATH for preview server so we keep these names for 'preview'
@@ -92,6 +92,11 @@ deploy_docs_production:
extends: extends:
- .deploy_docs_template - .deploy_docs_template
- .rules:protected-no_label - .rules:protected-no_label
stage: post_deploy
needs: # ensure runs after push_to_github succeeded
- build_docs_html
- build_docs_pdf
- push_to_github
variables: variables:
TYPE: "preview" TYPE: "preview"
DOCS_DEPLOY_PRIVATEKEY: "$DOCS_PROD_DEPLOY_KEY" DOCS_DEPLOY_PRIVATEKEY: "$DOCS_PROD_DEPLOY_KEY"