From c796705c0ad584dd1d41593054660929aab8be02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Minelli?= <michael@minelli.me>
Date: Fri, 15 Sep 2023 15:54:16 +0200
Subject: [PATCH] CI/CD => Enhancements
---
.gitlab-ci.yml | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bbb680a..ea9d4ea 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,8 +6,6 @@ variables:
DOCKER_TLS_CERTDIR:
DOCKER_DRIVER: overlay2
- PROJECT_NAME: DojoExerciseChecker
-
VERSION_DEV_SUFFIX: '-dev'
GITLAB_API_PROJECT_URL: ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}
@@ -22,11 +20,6 @@ variables:
script:
- IS_DEV=$([[ $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH ]] && echo false || echo true)
- VERSION=$(jq -r .version $PROJECT_FOLDER/package.json)$([[ $IS_DEV == true ]] && echo $VERSION_DEV_SUFFIX || echo '')
- - DOCKER_LOCAL_IMAGE_PATH=$ARTIFACTS_FOLDER/$VERSION.tar
-
-.get_packages_url:
- script:
- - PACKAGE_URL_DOCKER_IMAGE="${PACKAGE_REGISTRY_URL}/${VERSION}/${PROJECT_NAME}.tar"
.init_dind_script:
script:
@@ -66,12 +59,13 @@ variables:
stages:
+ - test
- build
- clean
- release
-build:test:
- stage: build
+test:build:
+ stage: test
tags:
- build
- dind
@@ -167,7 +161,6 @@ release:gitlab:
image: registry.gitlab.com/gitlab-ci-utils/curl-jq:latest
script:
- !reference [.get_version, script]
- - !reference [.get_packages_url, script]
- echo 'Running release_job'
# Extract description from CHANGELOG.md
- CHANGELOG_LINE_START=`awk '/##\ [0-9]+\.[0-9]+\.[0-9]+/{print NR; exit;}' CHANGELOG.md`
--
GitLab