diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index afd4006931e90f9ab00b3b1175ed515d94a5c951..03e725753cdf5026b6925fe687620edc22760fc7 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 bb03034b441b36628690197d643e51cb2b3c484c..53c1d79aa83eb7bb4bd05ef3d179d3049630c07e 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"