diff --git a/.docs/overrides/main.html b/.docs/overrides/main.html index 53b3c3176bb3ee6d9317fdb5ce048688e471387d..1fb4cb335356c245e7fb6d3e782bf8bab823ad3f 100644 --- a/.docs/overrides/main.html +++ b/.docs/overrides/main.html @@ -11,8 +11,10 @@ function getVersion() { const segments = location.pathname.split('/') if (segments.length === 5) { + console.log('version', segments[3], segments) return segments[3] } else { + console.log('version defaulted to 1.4') return '1.4' } } diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f0f429d712fb7d438d5fc7392a6682ac0f784fb4..b1ca067dd3a06c467c4163c0ed3f5c6b29db33e1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -440,7 +440,7 @@ release-latest: - echo "$CI_REGISTRY2_PASSWORD" | docker login --username "$CI_REGISTRY2_USER" --password-stdin $CI_REGISTRY2_URL - TAG=latest make release -release-version: +release-1.3: stage: release image: docker:24-dind needs: @@ -450,7 +450,7 @@ release-version: - test-frontend only: refs: - - master + - release-v1.3 script: - "ifconfig eth0 mtu 1450 up" - "apk add make" @@ -458,13 +458,32 @@ release-version: - echo "$CI_REGISTRY2_PASSWORD" | docker login --username "$CI_REGISTRY2_USER" --password-stdin $CI_REGISTRY2_URL - "TAG=1.3 make release" +release-1.4: + stage: release + image: docker:24-dind + needs: + - test-metadata-service + - test-data-service + - test-analyse-service + - test-frontend + only: + refs: + - release-v1.4 + script: + - "ifconfig eth0 mtu 1450 up" + - "apk add make" + - echo "$CI_REGISTRY_PASSWORD" | docker login --username "$CI_REGISTRY_USER" --password-stdin $CI_REGISTRY_URL + - echo "$CI_REGISTRY2_PASSWORD" | docker login --username "$CI_REGISTRY2_USER" --password-stdin $CI_REGISTRY2_URL + - "TAG=1.4 make release" + build-api-latest: stage: build image: docker.io/alpine:3.18 only: refs: - dev - - master + - release-v1.3 + - release-v1.4 script: - apk add bash git - git fetch && git checkout dev @@ -480,16 +499,17 @@ build-api-latest: - ./swagger/latest expire_in: 1 days -build-api-version: +build-api-1.3: stage: build image: docker.io/alpine:3.18 only: refs: - dev - - master + - release-v1.3 + - release-v1.4 script: - apk add bash git - - git fetch && git checkout master + - git fetch && git checkout release-v1.3 - bash .docs/.swagger/generate.sh - mkdir -p ./swagger/1.3 - cp -r ./site/* ./swagger/1.3/ @@ -502,13 +522,37 @@ build-api-version: - ./swagger/1.3 expire_in: 1 days +build-api-1.4: + stage: build + image: docker.io/alpine:3.18 + only: + refs: + - dev + - release-v1.3 + - release-v1.4 + script: + - apk add bash git + - git fetch && git checkout release-v1.4 + - bash .docs/.swagger/generate.sh + - mkdir -p ./swagger/1.4 + - cp -r ./site/* ./swagger/1.4/ + cache: + paths: + - ./swagger/1.4 + artifacts: + when: always + paths: + - ./swagger/1.4 + expire_in: 1 days + docs-registry: stage: docs image: docker.io/python:3.9-slim only: refs: - dev - - master + - release-v1.3 + - release-v1.4 script: - pip install -r ./requirements.txt - python3 .docs/docker/release.py @@ -526,11 +570,13 @@ docs-latest: image: docker.io/python:3.9-slim needs: - build-api-latest - - build-api-version + - build-api-1.3 + - build-api-1.4 only: refs: - dev - - master + - release-v1.3 + - release-v1.4 script: - apt-get update && apt-get install -y git make - git fetch && git checkout dev @@ -548,19 +594,20 @@ docs-latest: - ./final expire_in: 1 days -docs-version: +docs-1.3: stage: docs image: docker.io/python:3.9-slim needs: - build-api-latest - - build-api-version + - build-api-1.3 only: refs: - dev - - master + - release-v1.3 + - release-v1.4 script: - apt-get update && apt-get install -y git make - - git fetch && git checkout master + - git fetch && git checkout release-v1.3 - pip install -r ./.docs/requirements.txt - mkdir -p ./final - mkdocs build && cp -r ./site ./final/1.3 @@ -574,16 +621,46 @@ docs-version: - ./final expire_in: 1 days +docs-1.4: + stage: docs + image: docker.io/python:3.9-slim + needs: + - build-api-latest + - build-api-1.3 + - build-api-1.4 + only: + refs: + - dev + - release-v1.3 + - release-v1.4 + script: + - apt-get update && apt-get install -y git make + - git fetch && git checkout release-v1.4 + - pip install -r ./.docs/requirements.txt + - mkdir -p ./final + - mkdocs build && cp -r ./site ./final/1.4 + - cp -r ./swagger/1.4 ./final/1.4/swagger + cache: + paths: + - ./final + artifacts: + when: always + paths: + - ./final + expire_in: 1 days + release-docs: stage: release image: docker.io/finalgene/openssh:9.1 needs: - docs-latest - - docs-version + - docs-1.3 + - docs-1.4 only: refs: - dev - - master + - release-v1.3 + - release-v1.4 script: - eval $(ssh-agent -s) - echo "$CI_KEY_PRIVATE" > /root/.ssh/id_rsa && chmod 0600 /root/.ssh/id_rsa