From 25c2ed38d832aee61436d22cf7acd6ef135063ac Mon Sep 17 00:00:00 2001
From: Martin/Geno <geno+dev@fireorbit.de>
Date: Fri, 19 Apr 2019 18:01:58 +0200
Subject: [PATCH] improve gitlab-ci version naming + deploy releasefile

---
 .gitlab-ci.yml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7436d55f4..794bf7eeb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,16 +29,19 @@ publish:
   - develop
   script:
   # workaround for bug in fdroid nightly
+  - sed -i "s/-debug.apk/-unsigned.apk/" /usr/lib/python3/dist-packages/fdroidserver/nightly.py
   - sed -i "s/servergitmirror = 'git@' +/servergitmirror = 'gitlab@' +/" /usr/lib/python3/dist-packages/fdroidserver/nightly.py
   - sed -i "s/git@/gitlab@/" /usr/lib/python3/dist-packages/fdroidserver/index.py
   # generate new version
-  - export versionCode=`printf '%05d' $(date '+%s'| cut -b4-8)`
-  - sed -i "s/^\(\s*versionCode\s*[0-9]*\).*/\1$versionCode/" build.gradle
-  - export versionName=`printf '%s-%05d' $(git describe --tag --abbrev=0) $versionCode`
+  - export versionCode="$CI_JOB_ID"
+  - export versionName="$(git describe --tag --abbrev=0)-${CI_JOB_ID}_${CI_COMMIT_REF_NAME}"
+  - echo "set VersionCode '${versionCode}' and VersonName '${versionName}'"
+  - sed -i "s/^\(\s*versionCode\s*\).*$/\1$versionCode/" build.gradle
   - sed -i "0,/versionName/s/^\(\s*versionName\).*/\1 \"$versionName\"/" build.gradle
   - cat -n build.gradle
   # build free version
-  - ./gradlew assembleConversationsFreeCompatDebug
+  - ./gradlew assembleConversationsFreeCompatRelease
+  - ls build/outputs/apk/conversationsFreeCompat/*
   # publish on nightly fdroid repo
   - fdroid nightly -v