diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a3230d4e7c3cc3b0d5089e6143cc2cdd5ad768ad..d9ebe03ec7098c8b8c684d1d166643001ac0bbc7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -598,11 +598,9 @@ release-chart: - /^release-.*/ before_script: - "echo ${CI_REGISTRY2_PASSWORD} | docker login --username ${CI_REGISTRY2_USER} --password-stdin $CI_REGISTRY2_URL" - - "echo ${CI_GPG_KEYRING} | base64 -d > ~/keyring.gpg" - "apk add sed helm curl" - "helm plugin install https://github.com/sigstore/helm-sigstore" script: - - "helm package --sign --key 'Martin Weise' ./helm/dbrepo --keyring ~/keyring.gpg --destination ./build" - "helm push ./build/dbrepo-${CHART_VERSION}.tgz oci://${CI_REGISTRY2_URL}/helm" - "helm sigstore upload ./build/dbrepo-${CHART_VERSION}.tgz" @@ -618,6 +616,7 @@ release-docs: - "wget https://github.com/mikefarah/yq/releases/download/v4.2.0/yq_linux_amd64 -O /usr/bin/yq" - "chmod +x /usr/bin/yq" - "apt-get update && apt-get install -y git make sed wget ssh" + - "pip install -r ./requirements.txt" - "mkdir -p ./final/${VERSION}/swagger" script: - "make gen-swagger-doc gen-lib-doc gen-docs-doc" @@ -627,6 +626,7 @@ release-docs: - "cp .docs/.swagger/custom.css ./final/${VERSION}/swagger/custom.css" # swagger - "cp -r ./site ./final/${VERSION}" # mkdocs - eval $(ssh-agent -s) + - "mkdir -p /root/.ssh" - echo "$CI_KEY_PRIVATE" > /root/.ssh/id_rsa && chmod 0600 /root/.ssh/id_rsa - echo "$CI_KEY_PUBLIC" > /root/.ssh/id_rsa.pub - echo "$CI_DOC_ID" > ~/.ssh/known_hosts @@ -637,6 +637,7 @@ release-docs: release-libs: stage: release image: docker.io/python:3.11-alpine + when: manual only: refs: - /^release-.*/ diff --git a/build-docs.sh b/build-docs.sh index a38121fceb9a4cd1b43c34058755a049a08f8beb..fba2afc76609716172f53c8bb0125c579a99d8d9 100644 --- a/build-docs.sh +++ b/build-docs.sh @@ -88,6 +88,7 @@ done # finalization echo "===================================================" -echo "Moving default version $APP_VERSION docs to /" -cp -r ./final/${APP_VERSION}/* ./final/ +echo "Moving HTML redirect and JSON versions to /" +cp ./final/${APP_VERSION}/redirect.html ./final/index.html +cp ./final/${APP_VERSION}/versions.json ./final/versions.json echo "===================================================" diff --git a/helm/dbrepo/.helmignore b/helm/dbrepo/.helmignore index 62d87df84fcf8a1c6cdd3918d35280bfbd07f336..b9029e8dea3ccab2aabc5c3a8d9226e9bb9ac827 100644 --- a/helm/dbrepo/.helmignore +++ b/helm/dbrepo/.helmignore @@ -14,6 +14,7 @@ hack/ .svn/ # Generated build/ +artifacthub-repo.yml # Common backup files *.swp *.bak diff --git a/helm/artifacthub-repo.yml b/helm/dbrepo/artifacthub-repo.yml similarity index 100% rename from helm/artifacthub-repo.yml rename to helm/dbrepo/artifacthub-repo.yml diff --git a/mkdocs.yml b/mkdocs.yml index e4370152366f1e106cd95e23263bd62b481be5c0..3911589ff5880616420b466e4a7b04fbed73123d 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -1,4 +1,5 @@ site_name: Database Repository +site_url: https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/ repo_url: https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services repo_name: fda-services site_author: Research Unit Data Science, Technische Universität Wien