Skip to content
Snippets Groups Projects
Verified Commit 42b113a5 authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

ci: fix build failures with wrong jdk baseimage

parent a98c338b
No related branches found
No related tags found
No related merge requests found
Pipeline #2999 passed
image: "k8r.eu/justjanne/android-sdk:dfb791e9"
image: "k8r.eu/justjanne/android-sdk:eef7852b"
cache:
key: "$CI_PROJECT_NAME"
......
......@@ -24,13 +24,14 @@ class AndroidApplicationConvention : Plugin<Project> {
applicationId = "${rootProject.group}.${rootProject.name.lowercase(Locale.ROOT)}"
val commit = git("rev-parse", "HEAD")!!
val name = git("describe", "--always", "--tags", "HEAD")!!
val commit = git("rev-parse", "HEAD")
val name = git("describe", "--always", "--tags", "HEAD")
versionCode = git("rev-list", "--count", "HEAD")!!.toInt()
versionName = git("describe", "--always", "--tags", "HEAD")!!
versionCode = git("rev-list", "--count", "HEAD")?.toIntOrNull()
versionName = git("describe", "--always", "--tags", "HEAD")
val fancyVersionName = "<a href=\\\"https://git.kuschku.de/justJanne/QuasselDroid-ng/commit/$commit\\\">$name</a>"
val fancyVersionName = if (commit == null || name == null) name
else "<a href=\\\"https://git.kuschku.de/justJanne/QuasselDroid-ng/commit/$commit\\\">$name</a>"
buildConfigField("String", "GIT_HEAD", "\"${git("rev-parse", "HEAD") ?: ""}\"")
buildConfigField("String", "FANCY_VERSION_NAME", "\"${fancyVersionName ?: ""}\"")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment