mirror
/
esp-idf
kopia lustrzana https://github.com/espressif/esp-idf
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge branch 'feature/docs_rename_esp8684' into 'master' 

docs: update esp-docs, rename esp8684 to esp32c2

Closes IDF-4551

See merge request espressif/esp-idf!16871
pull/8284/head
morris 2022-01-21 05:06:40 +00:00
rodzic dcee019311 f018d3f2f0
commit b7f24e9903
4 zmienionych plików z 4 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
.gitlab-ci.yml
Wyświetl plik

@ -59,7 +59,7 @@ variables:
ESP_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/esp-env-v5.0:1" ESP_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/esp-env-v5.0:1"
AFL_FUZZER_TEST_IMAGE: "${CI_DOCKER_REGISTRY}/afl-fuzzer-test-v5.0:1-1" AFL_FUZZER_TEST_IMAGE: "${CI_DOCKER_REGISTRY}/afl-fuzzer-test-v5.0:1-1"
CLANG_STATIC_ANALYSIS_IMAGE: "${CI_DOCKER_REGISTRY}/clang-static-analysis-v5.0:1-1" CLANG_STATIC_ANALYSIS_IMAGE: "${CI_DOCKER_REGISTRY}/clang-static-analysis-v5.0:1-1"
ESP_IDF_DOC_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/esp-idf-doc-env-v5.0:1-1" ESP_IDF_DOC_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/esp-idf-doc-env-v5.0:1-2"
SONARQUBE_SCANNER_IMAGE: "${CI_DOCKER_REGISTRY}/sonarqube-scanner:3" SONARQUBE_SCANNER_IMAGE: "${CI_DOCKER_REGISTRY}/sonarqube-scanner:3"
LINUX_SHELL_IMAGE: "${CI_DOCKER_REGISTRY}/linux-shells:2" LINUX_SHELL_IMAGE: "${CI_DOCKER_REGISTRY}/linux-shells:2"

2
.gitlab/ci/docs.yml
Wyświetl plik

@ -69,7 +69,7 @@ check_docs_lang_sync:
parallel: parallel:
matrix: matrix:
- DOCLANG: ["en", "zh_CN"] - DOCLANG: ["en", "zh_CN"]
DOCTGT: ["esp32", "esp32s2", "esp32s3", "esp32c3"] # TODO: temporary disable building docs for esp32c2, IDF-4551 DOCTGT: ["esp32", "esp32s2", "esp32s3", "esp32c3", "esp32c2"]
check_docs_gh_links: check_docs_gh_links:
image: $ESP_IDF_DOC_ENV_IMAGE image: $ESP_IDF_DOC_ENV_IMAGE

2
docs/conf_common.py
Wyświetl plik

@ -172,7 +172,7 @@ html_context['github_repo'] = 'esp-idf'
project_slug = 'esp-idf' project_slug = 'esp-idf'
versions_url = 'https://dl.espressif.com/dl/esp-idf/idf_versions.js' versions_url = 'https://dl.espressif.com/dl/esp-idf/idf_versions.js'
idf_targets = ['esp32', 'esp32s2', 'esp32s3', 'esp32c3'] idf_targets = ['esp32', 'esp32s2', 'esp32s3', 'esp32c3', 'esp32c2']
languages = ['en', 'zh_CN'] languages = ['en', 'zh_CN']
google_analytics_id = os.environ.get('CI_GOOGLE_ANALYTICS_ID', None) google_analytics_id = os.environ.get('CI_GOOGLE_ANALYTICS_ID', None)

2
docs/requirements.txt
Wyświetl plik

@ -1 +1 @@
esp-docs==0.2.0 esp-docs==0.2.1