From 996858a902a99a899aaf4cb50b5bd08b008283ab Mon Sep 17 00:00:00 2001 From: tmadlener Date: Fri, 23 Aug 2024 16:56:25 +0200 Subject: [PATCH 1/7] Try to deploy to different path --- .gitlab-ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eddf40b01..06290e526 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -62,10 +62,15 @@ deployment: only: refs: - master + - versioned-docs # need the doxygen artifacts for this step dependencies: - generate-docs stage: deploy + + variables: + EOS_PATH: $EOS_DEPLOY_BASE_PATH/test_deplay_path + # see see https://gitlab.cern.ch/ci-tools/ci-web-deployer image: gitlab-registry.cern.ch/ci-tools/ci-web-deployer:latest script: From 66cf6342c96a7e36550a622ad847b5900ceacaf2 Mon Sep 17 00:00:00 2001 From: tmadlener Date: Fri, 23 Aug 2024 17:13:57 +0200 Subject: [PATCH 2/7] Create an output folder depending on tag or branch --- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 06290e526..2721c6f1d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -73,7 +73,9 @@ deployment: # see see https://gitlab.cern.ch/ci-tools/ci-web-deployer image: gitlab-registry.cern.ch/ci-tools/ci-web-deployer:latest + before_script: + - if [ -z "$CI_COMMIT_BRANCH" ]; then TARGET_DEPLOY_DIR=$CI_COMMIT_TAG; else TARGET_DEPLOY_DIR=$CI_COMMIT_BRANCH; fi + - export EOS_PATH=$EOS_DEPLOY_BASE_PATH/test_deploy/$TARGET_DEPLOY_DIR script: - deploy-eos - before_script: [] after_script: [] From b486f053c9e52fba3fdef70c5518e2099ae19c48 Mon Sep 17 00:00:00 2001 From: tmadlener Date: Fri, 23 Aug 2024 17:30:58 +0200 Subject: [PATCH 3/7] Choose better name for contents folder --- .gitlab-ci.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2721c6f1d..f851e5596 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,7 +48,7 @@ generate-docs: # CI_OUTPUT_DIR: doc_output # EOS_ACCOUNT_PASSWORD: xxx # EOS_ACCOUNT_USERNAME: xxx -# EOS_PATH: /eos/project/k/key4hep/www/key4hep/podio +# EOS_DEPLOY_BASE_PATH: /eos/project/k/key4hep/www/key4hep/podio # METHOD: rsync # are set in the repository https://gitlab.cern.ch/key4hep/podio, # which mirrors https://github.com/AIDASoft/podio @@ -68,14 +68,11 @@ deployment: - generate-docs stage: deploy - variables: - EOS_PATH: $EOS_DEPLOY_BASE_PATH/test_deplay_path - # see see https://gitlab.cern.ch/ci-tools/ci-web-deployer image: gitlab-registry.cern.ch/ci-tools/ci-web-deployer:latest before_script: - if [ -z "$CI_COMMIT_BRANCH" ]; then TARGET_DEPLOY_DIR=$CI_COMMIT_TAG; else TARGET_DEPLOY_DIR=$CI_COMMIT_BRANCH; fi - - export EOS_PATH=$EOS_DEPLOY_BASE_PATH/test_deploy/$TARGET_DEPLOY_DIR + - export EOS_PATH=$EOS_DEPLOY_BASE_PATH/_contents/$TARGET_DEPLOY_DIR script: - deploy-eos after_script: [] From 5180cfa623af0b1a82f624899919322d9dcb40c9 Mon Sep 17 00:00:00 2001 From: tmadlener Date: Fri, 23 Aug 2024 17:31:18 +0200 Subject: [PATCH 4/7] Add dynamically populated version selection to documentation --- doc/_templates/versions.html | 51 ++++++++++++++++++++++++++++++++++++ doc/conf.py | 2 +- 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 doc/_templates/versions.html diff --git a/doc/_templates/versions.html b/doc/_templates/versions.html new file mode 100644 index 000000000..161c1b682 --- /dev/null +++ b/doc/_templates/versions.html @@ -0,0 +1,51 @@ +
+ + + + + +
+
+ +
diff --git a/doc/conf.py b/doc/conf.py index afb0d83ec..188e70c6b 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -51,7 +51,7 @@ source_suffix = {".rst": "restructuredtext", ".md": "markdown"} # Add any paths that contain templates here, relative to this directory. -# templates_path = ["_templates"] +templates_path = ["_templates"] # List of patterns, relative to source directory, that match files and # directories to ignore when looking for source files. From 9c242d7976e1c8510c01a142bb09ef136b3588c7 Mon Sep 17 00:00:00 2001 From: tmadlener Date: Fri, 23 Aug 2024 20:55:34 +0200 Subject: [PATCH 5/7] Order available versions from newest to oldest --- doc/_templates/versions.html | 52 +++++++++++++++++++++++++++--------- 1 file changed, 40 insertions(+), 12 deletions(-) diff --git a/doc/_templates/versions.html b/doc/_templates/versions.html index 161c1b682..d03bcd181 100644 --- a/doc/_templates/versions.html +++ b/doc/_templates/versions.html @@ -9,6 +9,43 @@