From 8d10b948e0195b01e83a261a3ee0877c491ee426 Mon Sep 17 00:00:00 2001
From: JojoIV <jonas.broeckmann@gmx.de>
Date: Tue, 5 Mar 2024 20:42:16 +0100
Subject: [PATCH] Adjusted app version
---
.gitlab-ci.yml | 7 ++++++-
app/build.gradle.kts | 9 ++++++++-
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3a386bd..9f4ddc8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,7 @@ image: eclipse-temurin:17-jdk-jammy
variables:
- APP_VERSION: "1.0.2"
+ APP_VERSION: "1.0.3"
APP_APK: "kaffeekasse-${APP_VERSION}.apk"
PACKAGE_REGISTRY_URL: "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/kaffeekasse/${APP_VERSION}"
@@ -119,6 +119,11 @@ createPackage:
- if: $CI_COMMIT_TAG
before_script: []
script:
+ - |
+ if [ "v$APP_VERSION" != "$CI_COMMIT_TAG" ]; then
+ echo "APP_VERSION does not match the tag"
+ exit 1
+ fi
- cp app/build/outputs/apk/release/app-release.apk $APP_APK
- |
curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file $APP_APK "${PACKAGE_REGISTRY_URL}/${APP_APK}"
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 192178a..6824982 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -15,7 +15,14 @@ android {
minSdk = 29
targetSdk = 34
versionCode = 1
- versionName = "1.0.2"
+ versionName = "1.0.3"
+
+ System.getenv()["APP_VERSION"]?.let { versionFromEnv ->
+ require(versionFromEnv == versionName) {
+ "Version in environment ($versionFromEnv) does not match version in build.gradle.kts ($versionName)"
+ }
+ println("Version matches environment: $versionName")
+ }
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables {
--
GitLab