diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7bd9baf23b7d74d521f6bc1f441fe77c340942f4..05a7bf9b5fa79647110fe4bbc592490fb4a02142 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,8 @@ variables: TRIVY_CACHE_DIR: ".trivycache/" DOCKER_HOST: "unix:///var/run/dind/docker.sock" TESTCONTAINERS_RYUK_DISABLED: "false" - VERSION: "1.4.1" + APP_VERSION: "1.4.1" + CHART_VERSION: "1.4.1" image: debian:12-slim @@ -500,7 +501,7 @@ release-1.4: script: - "ifconfig eth0 mtu 1450 up" - "apk add make" - - "TAG=${VERSION} make release" + - "TAG=${APP_VERSION} make release" release-helm-latest: stage: release @@ -513,10 +514,10 @@ release-helm-latest: - echo "$CI_REGISTRY2_PASSWORD" | docker login --username "$CI_REGISTRY2_USER" --password-stdin $CI_REGISTRY2_URL script: - apk add sed helm - - 'sed -i -e "s/^version:.*/version: \"${VERSION}-0.git.${CI_PIPELINE_ID}.${CI_COMMIT_SHORT_SHA}\"/g" ./helm-charts/dbrepo/Chart.yaml' - - 'sed -i -e "s/^appVersion:.*/appVersion: \"${VERSION}-0.git.${CI_PIPELINE_ID}.${CI_COMMIT_SHORT_SHA}\"/g" ./helm-charts/dbrepo/Chart.yaml' + - 'sed -i -e "s/^version:.*/version: \"${CHART_VERSION}-RC1\"/g" ./helm-charts/dbrepo/Chart.yaml' + - 'sed -i -e "s/^appVersion:.*/appVersion: \"latest\"/g" ./helm-charts/dbrepo/Chart.yaml' - helm package ./helm-charts/dbrepo --destination ./build - - helm push "./build/dbrepo-${VERSION}-0.git.${CI_PIPELINE_ID}.${CI_COMMIT_SHORT_SHA}.tgz" "oci://${CI_REGISTRY2_URL}/helm" + - helm push "./build/dbrepo-${CHART_VERSION}-RC1.tgz" "oci://${CI_REGISTRY2_URL}/helm" release-helm-1.4: stage: release @@ -528,11 +529,11 @@ release-helm-1.4: - echo "$CI_REGISTRY2_PASSWORD" | docker login --username "$CI_REGISTRY2_USER" --password-stdin $CI_REGISTRY2_URL script: - apk add sed helm curl - - 'sed -i -e "s/^version:.*/version: \"${VERSION}\"/g" ./helm-charts/dbrepo/Chart.yaml' - - 'sed -i -e "s/^appVersion:.*/appVersion: \"${VERSION}\"/g" ./helm-charts/dbrepo/Chart.yaml' + - 'sed -i -e "s/^version:.*/version: \"${CHART_VERSION}\"/g" ./helm-charts/dbrepo/Chart.yaml' + - 'sed -i -e "s/^appVersion:.*/appVersion: \"${APP_VERSION}\"/g" ./helm-charts/dbrepo/Chart.yaml' - helm package ./helm-charts/dbrepo --destination ./build - - helm push "./build/dbrepo-${VERSION}.tgz" "oci://${CI_REGISTRY2_URL}/helm" - - curl -sSL -X POST --form 'chart=@dbrepo-${VERSION}.tgz' --user mweise:${GITLAB_ACCESS_TOKEN} https://gitlab.example.com/api/v4/projects/450/packages/helm/api/stable/charts + - helm push "./build/dbrepo-${CHART_VERSION}.tgz" "oci://${CI_REGISTRY2_URL}/helm" + - curl -sSL -X POST --form 'chart=@dbrepo-${CHART_VERSION}.tgz' --user mweise:${GITLAB_ACCESS_TOKEN} https://gitlab.example.com/api/v4/projects/450/packages/helm/api/stable/charts build-api-latest: stage: build @@ -592,15 +593,15 @@ build-api-1.4: - apk add bash git maven - git fetch && git checkout release-v1.4 - bash .docs/.swagger/swagger-site.sh - - mkdir -p ./swagger/${VERSION} - - cp -r ./site/* ./swagger/${VERSION}/ + - mkdir -p ./swagger/${APP_VERSION} + - cp -r ./site/* ./swagger/${APP_VERSION}/ cache: paths: - - ./swagger/${VERSION} + - ./swagger/${APP_VERSION} artifacts: when: always paths: - - ./swagger/${VERSION} + - ./swagger/${APP_VERSION} expire_in: 1 days docs-registry: @@ -640,8 +641,8 @@ docs-latest: - git fetch && git checkout master - pip install -r ./requirements.txt - mkdir -p ./final/{latest,1.3} - - sed -i -e "s/\$TAG/${VERSION}/g" - - sed -i -e "s/\$VERSION/${VERSION}/g" + - sed -i -e "s/\$TAG/${APP_VERSION}/g" + - sed -i -e "s/\$APP_VERSION/${APP_VERSION}/g" - mkdocs build && cp -r ./site ./final/latest - cp ./.docs/redirect.html ./final/index.html ./final/1.3/index.html - cp -r ./swagger/latest ./final/latest/swagger @@ -700,10 +701,10 @@ docs-1.4: - pip install -r ./.docs/requirements.txt - wget https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/dev/.docs/overrides/main.html -O .docs/overrides/main.html -q - mkdir -p ./final - - sed -i -e "s/\$TAG/${VERSION}/g" - - sed -i -e "s/\$VERSION/${VERSION}/g" - - mkdocs build && cp -r ./site ./final/${VERSION} - - cp -r ./swagger/${VERSION} ./final/${VERSION}/swagger + - sed -i -e "s/\$TAG/${APP_VERSION}/g" + - sed -i -e "s/\$APP_VERSION/${APP_VERSION}/g" + - mkdocs build && cp -r ./site ./final/${APP_VERSION} + - cp -r ./swagger/${APP_VERSION} ./final/${APP_VERSION}/swagger cache: paths: - ./final diff --git a/Makefile b/Makefile index 5883ac2b049372147baecbd9f4aae522e7ab4eb3..82490f7c6ef3268d60b5e6f22069a9ed304b5236 100644 --- a/Makefile +++ b/Makefile @@ -37,8 +37,6 @@ build-swagger: bash ./.docs/generate.sh build-helm-chart: - sed -i -e "s/^version:.*/version: \"${TAG}-dev\"/g" ./helm-charts/dbrepo/Chart.yaml - sed -i -e "s/^appVersion:.*/appVersion: \"${TAG}-dev\"/g" ./helm-charts/dbrepo/Chart.yaml helm package ./helm-charts/dbrepo --destination ./build tag: tag-analyse-service tag-authentication-service tag-metadata-db tag-ui tag-metadata-service tag-data-service tag-search-db tag-search-db-init tag-search-service tag-data-db-sidecar diff --git a/helm-charts/dbrepo/Chart.yaml b/helm-charts/dbrepo/Chart.yaml index 3096cea821e7475ecc7be52bf94623543b78ef1b..e7cb091c5a6786a1c347c11e828bb05330347e71 100644 --- a/helm-charts/dbrepo/Chart.yaml +++ b/helm-charts/dbrepo/Chart.yaml @@ -6,8 +6,8 @@ description: | is evolving, allows reproducing of query results and supports findable-, accessible-, interoperable- and reusable data. type: application -version: "1.4.0-dev.667653b51" -appVersion: "1.4.0-dev.667653b51" +version: "1.4.1-RC1" +appVersion: "1.4.0" keywords: - dbrepo maintainers: