From 1dd4c258dd24d0db3cb67bf3fa8e7defff828fe3 Mon Sep 17 00:00:00 2001 From: moon2 <moon2protonmail@protonmail.com> Date: Tue, 7 Jan 2025 15:57:54 +0100 Subject: [PATCH] docs: switch to release branches --- .gitlab-ci.yml | 4 +++- docs/conf.py | 9 +++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index afd4006931..03e725753c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,7 +62,9 @@ pages: rules: - if: $CI_COMMIT_BRANCH == "main" script: - - git checkout -b dev + - git tag | xargs git tag -d + - git branch | sed -e 's/..//' | grep '^release/' | while read b; do git branch -m "$b" "v${b#release/}"; done + - git branch -m main dev - mkdir public - cd docs - make versionedhtml diff --git a/docs/conf.py b/docs/conf.py index bb03034b44..53c1d79aa8 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -68,8 +68,13 @@ html_context = { 'theme_vcs_pageview_mode': "edit", } -smv_tag_whitelist = r'^v\d+\.\d+\.\d+$' -smv_branch_whitelist = r'dev' +smv_tag_whitelist = r'$^' +smv_branch_whitelist = r'^v\d+\.\d+\.\d+$|^dev$' + +if False: + # for local testing + smv_remote_whitelist = r'^origin$' + smv_branch_whitelist = r'^release/\d+\.\d+\.\d+$|^main$' def setup(app): tmpdir = "_build/mypystubs" -- GitLab