From 593b0e3d724b16351617d46c76e14a75be0bbbd5 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Fri, 12 Feb 2021 11:40:21 +0100
Subject: [PATCH] Finally fixing the release CI
---
.gitlab-ci.yml | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 305c27c..8f2ce1b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,8 +21,9 @@ build:
stage: "build"
script:
- "./gradlew build"
- except:
- - "tags"
+ rules:
+ - if: "$CI_COMMIT_BRANCH == 'master'"
+ when: always
test:
stage: "test"
@@ -34,8 +35,11 @@ test:
reports:
junit:
- "build/test-results/**/TEST-*.xml"
- except:
- - "tags"
+ rules:
+ - if: "$CI_COMMIT_BRANCH == 'master'"
+ when: always
+ dependencies:
+ - "build"
release:
stage: "release"
@@ -47,6 +51,7 @@ release:
- "build/libs/*"
dependencies:
- "build"
+ - "test"
rules:
- if: "$CI_COMMIT_TAG != '' && $CI_COMMIT_BRANCH == 'master'"
when: always
--
GitLab