diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fff35a132d1fa84cf10b219955e9a16a28712a6d..d2df14b434c3a603c2f270c3024769a3cb931157 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,37 +1,53 @@ image: "registry.gitlab.e.foundation:5000/e/apps/docker-android-apps-cicd:latest" stages: -- build + - build + - publish variables: GIT_SUBMODULE_STRATEGY: recursive before_script: -- if [ -d "/srv/userscripts" ]; then cp -R userscripts/* /srv/userscripts ; fi -- 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )' -- eval $(ssh-agent -s) -- echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null -- mkdir -p ~/.ssh -- chmod 700 ~/.ssh -- echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts -- chmod 644 ~/.ssh/known_hosts -- export GRADLE_USER_HOME=$(pwd)/.gradle -- chmod +x ./gradlew + - if [ -d "/srv/userscripts" ]; then cp -R userscripts/* /srv/userscripts ; fi + - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )' + - eval $(ssh-agent -s) + - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null + - mkdir -p ~/.ssh + - chmod 700 ~/.ssh + - echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts + - chmod 644 ~/.ssh/known_hosts + - export GRADLE_USER_HOME=$(pwd)/.gradle + - chmod +x ./gradlew cache: key: ${CI_PROJECT_ID} paths: - - .gradle/ + - .gradle/ build: stage: build script: - - echo sdk.dir $ANDROID_HOME > local.properties - - echo mapbox.key $MAPBOX_KEY >> local.properties - - echo mapbox.enabled true >> local.properties - - export TERM=dumb - - export JAVA_OPTS="-XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx4096m" - - ./gradlew assemble + - echo sdk.dir $ANDROID_HOME > local.properties + - echo mapbox.key $MAPBOX_KEY >> local.properties + - echo mapbox.enabled true >> local.properties + - export TERM=dumb + - export JAVA_OPTS="-XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx4096m" + - ./gradlew assembleRelease artifacts: paths: - - play-services-core/build/outputs/apk/ + - play-services-core/build/outputs/apk/ + +publish: + stage: publish + only: + - tags # Run only on tags + except: + - branches # Do not run this job on a branch + script: + - | + curl --fail --output "/dev/null" --silent --show-error --write-out "HTTP response: ${http_code}\n\n" \ + --header 'Content-Type: application/json' --header "PRIVATE-TOKEN: mkYsSXNe5yLhzhWSXGRv" \ + --data "{\"ref\" : \"${CI_COMMIT_SHA}\",\"name\": \"${CI_COMMIT_TAG}\", \"tag_name\": \"${CI_COMMIT_TAG}\", \"description\": \"${CI_COMMIT_TITLE}\", \"assets\": {\"links\": [{\"name\": \"GMSCore.apk\", \"url\": \"https://gitlab.e.foundation/api/v4/projects/149/jobs/artifacts/${CI_COMMIT_TAG}/raw//play-services-core/build/outputs/apk/release/play-services-core-release.apk?job=build\", \"filepath\": \"/play-services-core/build/outputs/apk/\", \"link_type\":\"other\" }] } }" \ + --request POST https://gitlab.e.foundation/api/v4/projects/149/releases + + diff --git a/play-services-core/build.gradle b/play-services-core/build.gradle index 0a16720d9bd71d0995eb18e8480a41ba8c8ccda2..1681e585bf79fbe9fd27882113749de2a1f9f2df 100644 --- a/play-services-core/build.gradle +++ b/play-services-core/build.gradle @@ -111,13 +111,25 @@ android { disable 'MissingTranslation', 'InvalidPackage', 'BatteryLife', 'ImpliedQuantity', 'MissingQuantity', 'InvalidWakeLockTag' } + signingConfigs { + release { + storeFile file("platform.keystore") + storePassword 'password' + keyAlias 'platform' + keyPassword 'password' + } + } + buildTypes { release { minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + signingConfig signingConfigs.release } } + + compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 diff --git a/play-services-core/platform.keystore b/play-services-core/platform.keystore new file mode 100644 index 0000000000000000000000000000000000000000..312862ed9dca0f7782330588d88805b4896285d6 Binary files /dev/null and b/play-services-core/platform.keystore differ