From 6118cf01fc0bee786360ea8c5ccdb614430878d2 Mon Sep 17 00:00:00 2001 From: Tanguy Herbron Date: Sat, 21 May 2022 20:42:43 +0200 Subject: [PATCH 1/3] Merge redundant building stage and fix badge generation --- .gitlab-ci.yml | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 795326e..2e2cb20 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,23 +1,6 @@ stages: - - prep - build -fetch-versions: - image: bash:latest - stage: prep - script: - - apk add git curl jq - - echo "export NEED_UPDATE=false" > .env.update - - git clone https://gitlab.com/gitlab-org/omnibus-gitlab - - cd omnibus-gitlab - - "HALIA_VER=$(curl --request GET -L --header 'Accept: application/json' --header 'Content-Type: application/json' https://git.halia.dev/api/v4/projects/24/registry/repositories/6/tags | jq -r '.[].location' | grep -v latest | cut -d ':' -f2 | sort -V | tail -1)" - - "GITLAB_VER=$(git tag | sort -V | grep -v rc | grep ce | tail -1 | cut -d '+' -f1)" - - if [ $HALIA_VER != $GITLAB_VER ]; then echo "export NEED_UPDATE=true" > ../.env.update; fi - artifacts: - paths: - - .env.update - expire_in: 1 week - build-image: image: docker:latest stage: build @@ -25,12 +8,15 @@ build-image: - name: docker:dind script: - source .env.update + - wget "https://img.shields.io/badge/image version-$GITLAB_SHORT_VER-informational" -O ../../image_version.svg - if [ "$NEED_UPDATE" = false ]; then exit 0; fi - - apk add git wget + - apk add git wget curl jq - git clone https://gitlab.com/gitlab-org/omnibus-gitlab - cd omnibus-gitlab + - "HALIA_VER=$(curl --request GET -L --header 'Accept: application/json' --header 'Content-Type: application/json' https://git.halia.dev/api/v4/projects/24/registry/repositories/6/tags | jq -r '.[].location' | grep -v latest | cut -d ':' -f2 | sort -V | tail -1)" - "GITLAB_VER=$(git tag | sort -V | grep -v rc | grep ce | tail -1)" - "GITLAB_SHORT_VER=$(echo $GITLAB_VER | cut -d '+' -f 1)" + - if [ $HALIA_VER != $GITLAB_VER ]; then echo "No update available, exciting..."; exit 0; fi - git checkout $GITLAB_VER - "GITLAB_VER=$(echo $GITLAB_VER | tr '+' -)" - NEW_URL="wget --no-check-certificate --content-disposition 'https://packages.gitlab.com/gitlab/gitlab-ce/packages/ubuntu/focal/gitlab-ce_${GITLAB_VER}_arm64.deb/download.deb' -O /tmp/gitlab.deb" @@ -43,7 +29,6 @@ build-image: - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - docker build -t $CI_REGISTRY/athens-school/gitlab:$GITLAB_SHORT_VER . - docker push $CI_REGISTRY/athens-school/gitlab:$GITLAB_SHORT_VER - - wget "https://img.shields.io/badge/image version-$GITLAB_SHORT_VER-informational" -O ../../image_version.svg artifacts: paths: - image_version.svg -- 2.45.2 From ef64468bc3b7f50dcefd08fc3914e8a28f4ba8ef Mon Sep 17 00:00:00 2001 From: Tanguy Herbron Date: Sat, 21 May 2022 20:44:38 +0200 Subject: [PATCH 2/3] Removing incorrect file sourcing and fix badge generation --- .gitlab-ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2e2cb20..9931e6f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,15 +7,13 @@ build-image: services: - name: docker:dind script: - - source .env.update - - wget "https://img.shields.io/badge/image version-$GITLAB_SHORT_VER-informational" -O ../../image_version.svg - - if [ "$NEED_UPDATE" = false ]; then exit 0; fi - apk add git wget curl jq - git clone https://gitlab.com/gitlab-org/omnibus-gitlab - cd omnibus-gitlab - "HALIA_VER=$(curl --request GET -L --header 'Accept: application/json' --header 'Content-Type: application/json' https://git.halia.dev/api/v4/projects/24/registry/repositories/6/tags | jq -r '.[].location' | grep -v latest | cut -d ':' -f2 | sort -V | tail -1)" - "GITLAB_VER=$(git tag | sort -V | grep -v rc | grep ce | tail -1)" - "GITLAB_SHORT_VER=$(echo $GITLAB_VER | cut -d '+' -f 1)" + - wget "https://img.shields.io/badge/image version-$GITLAB_SHORT_VER-informational" -O ../../image_version.svg - if [ $HALIA_VER != $GITLAB_VER ]; then echo "No update available, exciting..."; exit 0; fi - git checkout $GITLAB_VER - "GITLAB_VER=$(echo $GITLAB_VER | tr '+' -)" -- 2.45.2 From 1238b024f1e435720d86c2086d1c7a9973b88eb8 Mon Sep 17 00:00:00 2001 From: Tanguy Herbron Date: Sat, 21 May 2022 20:48:11 +0200 Subject: [PATCH 3/3] Fix version badge path --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9931e6f..aaca394 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,7 +13,7 @@ build-image: - "HALIA_VER=$(curl --request GET -L --header 'Accept: application/json' --header 'Content-Type: application/json' https://git.halia.dev/api/v4/projects/24/registry/repositories/6/tags | jq -r '.[].location' | grep -v latest | cut -d ':' -f2 | sort -V | tail -1)" - "GITLAB_VER=$(git tag | sort -V | grep -v rc | grep ce | tail -1)" - "GITLAB_SHORT_VER=$(echo $GITLAB_VER | cut -d '+' -f 1)" - - wget "https://img.shields.io/badge/image version-$GITLAB_SHORT_VER-informational" -O ../../image_version.svg + - wget "https://img.shields.io/badge/image version-$GITLAB_SHORT_VER-informational" -O ../image_version.svg - if [ $HALIA_VER != $GITLAB_VER ]; then echo "No update available, exciting..."; exit 0; fi - git checkout $GITLAB_VER - "GITLAB_VER=$(echo $GITLAB_VER | tr '+' -)" -- 2.45.2