From ea0c9ac234826983845895d830227b8fa73d75ef Mon Sep 17 00:00:00 2001 From: az Date: Sat, 4 Dec 2021 11:25:16 +0100 Subject: [PATCH] v0.8.28 fix ci for release --- .gitlab-ci.yml | 12 +++++------- build.gradle | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ebcfcef..44bcba1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,7 +13,7 @@ before_script: - chmod +x gradlew - echo "------ commit tag ---------------" - echo $CI_COMMIT_TAG - - echo $SHELL + - echo $CI_COMMIT_REF_NAME cache: paths: @@ -30,7 +30,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 @@ -80,16 +80,13 @@ 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_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: @@ -111,7 +108,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_TAG =~ /^v[0-9]+[.][0-9]+([.][0-9]+)?$/ needs: - job: fatjars artifacts: true @@ -120,6 +117,7 @@ release: - echo '------------ creating a release -------------' - echo 'Fatjar Job ID:' - echo $FATJAR_JOB_ID + - echo $CI_COMMIT_TAG release: name: 'Release $CI_COMMIT_TAG' description: 'Release of provs' diff --git a/build.gradle b/build.gradle index b20a881..e19921c 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ apply plugin: 'kotlinx-serialization' group = 'org.domaindrivenarchitecture.provs' -version = '0.8.26' +version = '0.8.28' repositories { mavenCentral()