From 8f9f77b27befdecc5e811f6afb5696adbc772ee8 Mon Sep 17 00:00:00 2001 From: az Date: Fri, 3 Dec 2021 18:44:15 +0100 Subject: [PATCH] v0.8.26 fix ci for commit tag in release job --- .gitlab-ci.yml | 6 ++++-- build.gradle | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dd59f80..54e4373 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,6 +13,7 @@ before_script: - chmod +x gradlew - echo "------ commit tag ---------------" - echo $CI_COMMIT_TAG + - echo $SHELL cache: paths: @@ -79,9 +80,10 @@ 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" && $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: @@ -110,7 +112,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 36c8e4f..b20a881 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ apply plugin: 'kotlinx-serialization' group = 'org.domaindrivenarchitecture.provs' -version = '0.8.25' +version = '0.8.26' repositories { mavenCentral()