diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d9d7ef4..a10eb20 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,28 +4,28 @@ build-android: apt update && apt install -y openjdk-17-jdk-headless unzip curl rsync patch /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="$(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 - - git tag v$version -f - - make lib_install - - export PATH="$PATH:$(go env GOPATH)/bin" - - make lib_android - - cd clients/android && git checkout dev && cd ../.. - - go run -v ./cmd/internal/update_android_version --ci --nightly - - 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 - - cp clients/android/app/build/outputs/apk/other/release/*.apk dist - - cp clients/android/app/build/outputs/apk/otherLegacy/release/*.apk dist - - VERSION_CODE=$(grep VERSION_CODE clients/android/version.properties | cut -d= -f2) - - VERSION_NAME=$(grep VERSION_NAME clients/android/version.properties | cut -d= -f2) + script: | + 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 + git tag v$version -f + make lib_install + export PATH="$PATH:$(go env GOPATH)/bin" + make lib_android + cd clients/android && git checkout dev && cd ../.. + go run -v ./cmd/internal/update_android_version --ci --nightly + 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 + cp clients/android/app/build/outputs/apk/other/release/*.apk dist + cp clients/android/app/build/outputs/apk/otherLegacy/release/*.apk dist + VERSION_CODE=$(grep VERSION_CODE clients/android/version.properties | cut -d= -f2) + VERSION_NAME=$(grep VERSION_NAME clients/android/version.properties | cut -d= -f2) variables: ANDROID_NDK_VERSION: r28 LOCAL_PROPERTIES: "S0VZU1RPUkVfUEFTUz0xMTQ1MTQKQUxJQVNfTkFNRT1hbGlhcwpBTElBU19QQVNTPTExNDUxNAo="