diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a2c6aec..d9d7ef4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ build-android: /usr/lib/jvm/java-17-openjdk-amd64/bin/java --version mkdir -p ~/.ssh && ssh-keyscan -p 22 -t rsa,ed25519 git.inker.bot >> ~/.ssh/known_hosts script: - - export version="$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA" && echo "building version $version" + - export version="$(git describe --tags)-$CI_COMMIT_SHORT_SHA" && echo "building version $version" - bash ./setup-ndk.sh - bin/update && bin/apply-ci && cd works/core - git submodule update --init --recursive @@ -18,6 +18,7 @@ build-android: - mkdir clients/android/app/libs # start building - cp *.aar clients/android/app/libs - cd clients/android + - echo "Gonna build with ANDROID_HOME=$ANDROID_HOME" - ./gradlew :app:assembleOtherRelease :app:assembleOtherLegacyRelease - cd ../.. - mkdir -p dist # prepare upload