CI: update esp-idf-doc-env docker image version

This commit is contained in:
Marius Vikhammer
2022-04-25 14:56:01 +08:00
parent 389cef7739
commit 116eda0bd2
2 changed files with 11 additions and 9 deletions

View File

@@ -56,7 +56,7 @@ variables:
# Docker images # Docker images
BOT_DOCKER_IMAGE_TAG: ":latest" BOT_DOCKER_IMAGE_TAG: ":latest"
ESP_IDF_DOC_ENV_IMAGE: "$CI_DOCKER_REGISTRY/esp-idf-doc-env:v4.4-1-v5" ESP_IDF_DOC_ENV_IMAGE: "$CI_DOCKER_REGISTRY/esp-idf-doc-env:v4.4-1-v6"
ESP_ENV_IMAGE: "$CI_DOCKER_REGISTRY/esp-env:v4.4-1" ESP_ENV_IMAGE: "$CI_DOCKER_REGISTRY/esp-env:v4.4-1"
AFL_FUZZER_TEST_IMAGE: "$CI_DOCKER_REGISTRY/afl-fuzzer-test:v4.4-1-1" AFL_FUZZER_TEST_IMAGE: "$CI_DOCKER_REGISTRY/afl-fuzzer-test:v4.4-1-1"
CLANG_STATIC_ANALYSIS_IMAGE: "${CI_DOCKER_REGISTRY}/clang-static-analysis:v4.4-1-2" CLANG_STATIC_ANALYSIS_IMAGE: "${CI_DOCKER_REGISTRY}/clang-static-analysis:v4.4-1-2"

View File

@@ -58,13 +58,14 @@ check_docs_lang_sync:
.build_docs_template: .build_docs_template:
image: $ESP_IDF_DOC_ENV_IMAGE image: $ESP_IDF_DOC_ENV_IMAGE
variables: variables:
PYTHON_VER: 3.6.13 PYTHON_VER: 3.7.10
tags: tags:
- build_docs - build_docs
dependencies: [] dependencies: []
script: script:
- cd docs
- pip install -r requirements.txt - pip install -r requirements.txt
- cd docs
- pip install -U -r requirements.txt
- build-docs -t $DOCTGT -bs $DOC_BUILDERS -l $DOCLANG build - build-docs -t $DOCTGT -bs $DOC_BUILDERS -l $DOCLANG build
parallel: parallel:
matrix: matrix:
@@ -74,13 +75,14 @@ check_docs_lang_sync:
check_docs_gh_links: check_docs_gh_links:
image: $ESP_IDF_DOC_ENV_IMAGE image: $ESP_IDF_DOC_ENV_IMAGE
variables: variables:
PYTHON_VER: 3.6.13 PYTHON_VER: 3.7.10
extends: extends:
- .pre_check_job_template - .pre_check_job_template
- .doc-rules:build:docs - .doc-rules:build:docs
script: script:
- cd docs
- pip install -r requirements.txt - pip install -r requirements.txt
- cd docs
- pip install -U -r requirements.txt
- build-docs gh-linkcheck - build-docs gh-linkcheck
# stage: build_doc # stage: build_doc
@@ -150,20 +152,19 @@ build_docs_pdf:
extends: extends:
- .before_script_no_sync_submodule - .before_script_no_sync_submodule
image: $ESP_IDF_DOC_ENV_IMAGE image: $ESP_IDF_DOC_ENV_IMAGE
variables:
PYTHON_VER: 3.6.13
stage: test_deploy stage: test_deploy
tags: tags:
- deploy - deploy
- shiny - shiny
variables: variables:
PYTHON_VER: 3.7.10
DOCS_BUILD_DIR: "${IDF_PATH}/docs/_build/" DOCS_BUILD_DIR: "${IDF_PATH}/docs/_build/"
PYTHONUNBUFFERED: 1 PYTHONUNBUFFERED: 1
dependencies: [] dependencies: []
script: script:
- add_doc_server_ssh_keys $DOCS_DEPLOY_PRIVATEKEY $DOCS_DEPLOY_SERVER $DOCS_DEPLOY_SERVER_USER - add_doc_server_ssh_keys $DOCS_DEPLOY_PRIVATEKEY $DOCS_DEPLOY_SERVER $DOCS_DEPLOY_SERVER_USER
- export GIT_VER=$(git describe --always ${PIPELINE_COMMIT_SHA} --) - export GIT_VER=$(git describe --always ${PIPELINE_COMMIT_SHA} --)
- pip install -r docs/requirements.txt - pip install -U -r docs/requirements.txt
- deploy-docs - deploy-docs
# stage: test_deploy # stage: test_deploy
@@ -224,7 +225,8 @@ check_doc_links:
expire_in: 1 week expire_in: 1 week
allow_failure: true allow_failure: true
script: script:
- cd docs
- pip install -r requirements.txt - pip install -r requirements.txt
- cd docs
- pip install -U -r requirements.txt
# At the moment this check will always fail due to multiple known limitations, ignore result # At the moment this check will always fail due to multiple known limitations, ignore result
- build-docs -t $DOCTGT -l $DOCLANG linkcheck || { echo "THERE ARE ISSUES DUE TO KNOWN LIMITATIONS, PLEASE FIX THEM. Nowadays we're ignored them to pass pipeline."; true; } - build-docs -t $DOCTGT -l $DOCLANG linkcheck || { echo "THERE ARE ISSUES DUE TO KNOWN LIMITATIONS, PLEASE FIX THEM. Nowadays we're ignored them to pass pipeline."; true; }