From 2fea9c257efd4300d102f843b03ea2235b0e55eb Mon Sep 17 00:00:00 2001 From: az Date: Fri, 3 Dec 2021 16:10:47 +0100 Subject: [PATCH] v0.8.25 fix ci for commit tag in release job --- .gitlab-ci.yml | 9 ++++++--- build.gradle | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c2b948d..dd59f80 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,7 +29,7 @@ build: - build/libs/*.jar expire_in: 1 week -test: +.test: stage: test rules: - if: $CI_COMMIT_TAG == null # don't run for git tags @@ -79,13 +79,16 @@ fatjars: when: never # Only execute when a valid version tag like v1.0, 2.3 or similar is given # Required is always one point like 1.0 - - if: $CI_COMMIT_REF_NAME == "master" # fix: && $CI_COMMIT_TAG =~ /^v?[0-9]+[.][0-9]+([.][0-9]+)?$/ + - if: '$CI_COMMIT_REF_NAME == "master" && $CI_COMMIT_TAG =~ /^v?[0-9]+[.][0-9]+([.][0-9]+)?$/' before_script: - echo $CI_JOB_ID # Writing FATJAR_JOB_ID variable to environment file, as variable is needed in the release stage. - echo FATJAR_JOB_ID=$CI_JOB_ID >> generate_executables.env script: - echo "---------- create fatjar ----------" + - echo $CI_COMMIT_TAG + - echo "$CI_COMMIT_TAG" + - echo '$CI_COMMIT_TAG' - ./gradlew fatJarLatest - ./gradlew fatJarK3s artifacts: @@ -107,7 +110,7 @@ release: when: never # Only execute when a valid version tag like v1.0, 2.3 or similar is given # Required is always one point like 1.0 - - if: $CI_COMMIT_REF_NAME == "master" && $CI_COMMIT_TAG =~ /^v?[0-9]+[.][0-9]+([.][0-9]+)?$/ + - if: '$CI_COMMIT_REF_NAME == "master" && $CI_COMMIT_TAG =~ /^v?[0-9]+[.][0-9]+([.][0-9]+)?$/' needs: - job: fatjars artifacts: true diff --git a/build.gradle b/build.gradle index 1bf9d7f..36c8e4f 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ apply plugin: 'kotlinx-serialization' group = 'org.domaindrivenarchitecture.provs' -version = '0.8.24' +version = '0.8.25' repositories { mavenCentral()