Skip to content

Commit 1bc914b

Browse files
committed
Merge branch 'docs/update_conf_common' into 'master'
Docs/update conf common See merge request adf/esp-adf-internal!1339
2 parents 548536a + 393f6f8 commit 1bc914b

File tree

5 files changed

+18
-25
lines changed

5 files changed

+18
-25
lines changed

.gitlab-ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ stages:
22
- pre_check
33
- build
44
- target_test
5+
- test_deploy
56
- deploy
67
- post_deploy
78

.gitlab/ci/docs.yml

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
.patterns-docs-preview: &patterns-docs-preview
1212
- "docs/**/*"
1313

14+
.if-schedule: &if-schedule
15+
if: '$CI_PIPELINE_SOURCE == "schedule"'
16+
1417
.if-merge_request_event: &if-merge_request_event
1518
if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
1619

@@ -39,6 +42,8 @@
3942

4043
.doc-rules:deploy:docs_production:
4144
rules:
45+
- <<: *if-schedule
46+
when: never
4247
- <<: *if-protected
4348

4449
.before_script_install_requirements:
@@ -127,10 +132,12 @@ build_docs_pdf:
127132
- deploy-docs
128133

129134
# stage: test_deploy
130-
.deploy_docs_preview:
135+
deploy_docs_preview:
131136
extends:
132137
- .deploy_docs_template
133138
rules:
139+
- <<: *if-schedule
140+
when: never
134141
- <<: *if-merge_request_event
135142
- <<: *if-open-merge-request
136143
when: never
@@ -141,12 +148,12 @@ build_docs_pdf:
141148
changes: *patterns-docs-preview
142149
variables:
143150
TYPE: "preview"
144-
# older branches use DOCS_DEPLOY_KEY, DOCS_SERVER, DOCS_SERVER_USER, DOCS_PATH for preview server so we keep these names for 'preview'
145-
DOCS_DEPLOY_PRIVATEKEY: "$DOCS_DEPLOY_KEY"
146-
DOCS_DEPLOY_SERVER: "$DOCS_SERVER"
147-
DOCS_DEPLOY_SERVER_USER: "$DOCS_SERVER_USER"
148-
DOCS_DEPLOY_PATH: "$DOCS_PATH"
149-
DOCS_DEPLOY_URL_BASE: "https://$DOCS_PREVIEW_SERVER_URL/docs/esp-adf"
151+
# older branches use DOCS_PREVIEW_PRIVATEKEY, DOCS_PREVIEW_SERVER, DOCS_PREVIEW_SERVER_USER, DOCS_PATH for preview server so we keep these names for 'preview'
152+
DOCS_DEPLOY_PRIVATEKEY: "$DOCS_PREVIEW_PRIVATEKEY"
153+
DOCS_DEPLOY_SERVER: "$DOCS_PREVIEW_SERVER"
154+
DOCS_DEPLOY_SERVER_USER: "$DOCS_PREVIEW_SERVER_USER"
155+
DOCS_DEPLOY_PATH: "$DOCS_PREVIEW_PATH"
156+
DOCS_DEPLOY_URL_BASE: "$DOCS_PREVIEW_URL_BASE"
150157

151158
# stage: post_deploy
152159
deploy_docs_production:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Espressif Audio Development Framework
22

3-
[![Documentation Status](https://readthedocs.com/projects/espressif-esp-adf/badge/?version=latest)](https://docs.espressif.com/projects/esp-adf/en/latest/?badge=latest)
3+
[![Documentation Status](./docs/_static/doc_latest.svg)](https://docs.espressif.com/projects/esp-adf/en/latest/?badge=latest)
44

55
Espressif Systems Audio Development Framework (ESP-ADF) is the official audio development framework for the [ESP32](https://espressif.com/en/products/hardware/esp32/overview), [ESP32-S2](https://www.espressif.com/en/products/socs/esp32-s2), [ESP32-C3](https://www.espressif.com/en/products/socs/esp32-c3), [ESP32-C6](https://www.espressif.com/en/products/socs/esp32-c6), [ESP32-S3](https://www.espressif.com/en/products/socs/esp32-s3), and [ESP32-P4](https://www.espressif.com/en/products/socs/esp32-p4) SoCs.
66

docs/_static/doc_latest.svg

Lines changed: 2 additions & 0 deletions
Loading

docs/conf_common.py

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -75,23 +75,6 @@
7575
master_doc = 'index'
7676

7777

78-
# The version info for the project you're documenting, acts as replacement for
79-
# |version| and |release|, also used in various other places throughout the
80-
# built documents.
81-
#
82-
83-
# Readthedocs largely ignores 'version' and 'release', and displays one of
84-
# 'latest', tag name, or branch name, depending on the build type.
85-
# Still, this is useful for non-RTD builds.
86-
# This is supposed to be "the short X.Y version", but it's the only version
87-
# visible when you open index.html.
88-
# Display full version to make things less confusing.
89-
version = run_cmd_get_output('git describe')
90-
# The full version, including alpha/beta/rc tags.
91-
# If needed, nearest tag is returned by 'git describe --abbrev=0'.
92-
release = version
93-
print('Version: {0} Release: {1}'.format(version, release))
94-
9578
# There are two options for replacing |today|: either, you set today to some
9679
# non-false value, then it is used:
9780
#today = ''

0 commit comments

Comments
 (0)