From 40fc0eee1f1aff6d8df688b4aedb57578611f51a Mon Sep 17 00:00:00 2001
From: Janne Mareike Koschinski <janne@kuschku.de>
Date: Wed, 23 Feb 2022 21:37:58 +0100
Subject: [PATCH] build: extract version task
---
.gitlab-ci.yml | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d85852398..b6f90900d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,22 +13,18 @@ before_script:
- "echo $SIGNING_PROPERTIES | base64 -d > signing.properties"
stages:
- - "test"
+ - "build"
- "deploy"
test:
- stage: "test"
+ stage: "build"
script:
- "./gradlew assembleRelease -x lintRelease -x lintVitalRelease"
- "cp app/build/outputs/apk/release/*.apk ."
- - "export VERSION_NAME=$(git describe --abbrev=0 --tags HEAD)"
- - "export VERSION_CODE=$(git rev-list --count $VERSION_NAME)"
- - "echo \"{\\\"name\\\":\\\"$VERSION_NAME\\\",\\\"code\\\":$VERSION_CODE}\" > version.json"
- "./gradlew check -x connectedCheck --stacktrace"
artifacts:
paths:
- "*.apk"
- - "version.json"
- "*/build/test-results/**/TEST-*.xml"
- "*/build/reports/*.xml"
reports:
@@ -39,12 +35,26 @@ test:
- if: "$CI_COMMIT_BRANCH == 'main'"
when: on_success
+version:
+ stage: "build"
+ script:
+ - "export VERSION_NAME=$(git describe --abbrev=0 --tags HEAD)"
+ - "export VERSION_CODE=$(git rev-list --count $VERSION_NAME)"
+ - "echo \"{\\\"name\\\":\\\"$VERSION_NAME\\\",\\\"code\\\":$VERSION_CODE}\" > version.json"
+ artifacts:
+ paths:
+ - "version.json"
+ rules:
+ - if: "$CI_COMMIT_BRANCH == 'main'"
+ when: on_success
+
deploy-local:
stage: "deploy"
image: "k8r.eu/justjanne/docker-s3cmd:latest"
cache: { }
dependencies:
- "test"
+ - "version"
script:
- "echo $S3_CONFIG | base64 -d > $HOME/.s3cfg"
- "export VERSION=$(ls *.apk)"
--
GitLab