Loading .gitlab-ci.yml +19 −11 Original line number Diff line number Diff line Loading @@ -19,6 +19,16 @@ before_script: - export GRADLE_USER_HOME=$(pwd)/.gradle - chmod +x ./gradlew .default_before_script: &default_before_script - echo sdk.dir $ANDROID_HOME > local.properties - echo mapbox.key $MAPBOX_KEY >> local.properties - echo mapbox.enabled true >> local.properties - echo ichnaea.key $ICHNAEA_KEY >> local.properties - echo stadia.key $STADIA_KEY >> local.properties - echo "${KEYSTORE}" | base64 -d > play-services-core/e.keystore - export TERM=dumb - export JAVA_OPTS="-XX:+HeapDumpOnOutOfMemoryError -Xmx4096m" cache: key: ${CI_PROJECT_ID} paths: Loading @@ -31,15 +41,8 @@ build: when: never - when: always before_script: - echo sdk.dir $ANDROID_HOME > local.properties - echo mapbox.key $MAPBOX_KEY >> local.properties - echo mapbox.enabled true >> local.properties - echo modules.nearby=false >> local.properties - echo ichnaea.key $ICHNAEA_KEY >> local.properties - echo stadia.key $STADIA_KEY >> local.properties - echo "${KEYSTORE}" | base64 -d > play-services-core/e.keystore - export TERM=dumb - export JAVA_OPTS="-XX:+HeapDumpOnOutOfMemoryError -Xmx4096m" - *default_before_script - echo modules.nearby false >> local.properties script: - ./gradlew assembleDebug - ./gradlew assembleRelease Loading @@ -47,10 +50,15 @@ build: paths: - play-services-core/build/outputs/apk/ build-release: build-nearby: extends: build stage: build rules: - if: $CI_COMMIT_TAG && $CI_COMMIT_REF_PROTECTED == "true" - when: always before_script: - *default_before_script - echo modules.nearby true >> local.properties script: - ./gradlew assemble Loading @@ -63,6 +71,6 @@ publish: - | curl --fail --output "/dev/null" --silent --show-error \ --header 'Content-Type: application/json' --header "PRIVATE-TOKEN: ${PUBLICATION_TOKEN}" \ --data "{\"ref\":\"${CI_COMMIT_SHA}\",\"name\":\"${CI_COMMIT_TAG}\",\"tag_name\":\"${CI_COMMIT_TAG}\",\"description\":\"${CI_COMMIT_TITLE}\",\"assets\":{\"links\":[{\"name\":\"GmsCore-test.apk\",\"url\":\"https://gitlab.e.foundation/api/v4/projects/149/jobs/artifacts/${CI_COMMIT_TAG}/raw/play-services-core/build/outputs/apk/withMapboxWithNearby/releaseTest/play-services-core-withMapbox-withNearby-releaseTest.apk?job=build-release\",\"link_type\":\"package\"},{\"name\":\"GmsCore-dev.apk\",\"url\":\"https://gitlab.e.foundation/api/v4/projects/149/jobs/artifacts/${CI_COMMIT_TAG}/raw/play-services-core/build/outputs/apk/withMapboxWithNearby/releaseDev/play-services-core-withMapbox-withNearby-releaseDev.apk?job=build-release\",\"link_type\":\"package\"},{\"name\":\"GmsCore-stable.apk\",\"url\":\"https://gitlab.e.foundation/api/v4/projects/149/jobs/artifacts/${CI_COMMIT_TAG}/raw/play-services-core/build/outputs/apk/withMapboxWithNearby/releaseStable/play-services-core-withMapbox-withNearby-releaseStable.apk?job=build-release\",\"link_type\":\"package\"}]}}" \ --data "{\"ref\":\"${CI_COMMIT_SHA}\",\"name\":\"${CI_COMMIT_TAG}\",\"tag_name\":\"${CI_COMMIT_TAG}\",\"description\":\"${CI_COMMIT_TITLE}\",\"assets\":{\"links\":[{\"name\":\"GmsCore-test.apk\",\"url\":\"https://gitlab.e.foundation/api/v4/projects/149/jobs/artifacts/${CI_COMMIT_TAG}/raw/play-services-core/build/outputs/apk/mapboxDefault/releaseTest/play-services-core-withMapbox-withNearby-releaseTest.apk?job=build-nearby\",\"link_type\":\"package\"},{\"name\":\"GmsCore-dev.apk\",\"url\":\"https://gitlab.e.foundation/api/v4/projects/149/jobs/artifacts/${CI_COMMIT_TAG}/raw/play-services-core/build/outputs/apk/mapboxDefault/releaseDev/play-services-core-mapbox-default-releaseDev.apk?job=build-nearby\",\"link_type\":\"package\"},{\"name\":\"GmsCore-stable.apk\",\"url\":\"https://gitlab.e.foundation/api/v4/projects/149/jobs/artifacts/${CI_COMMIT_TAG}/raw/play-services-core/build/outputs/apk/mapboxDefault/releaseStable/play-services-core-mapbox-default-releaseStable.apk?job=build-nearby\",\"link_type\":\"package\"}]}}" \ --request POST https://gitlab.e.foundation/api/v4/projects/149/releases Loading
.gitlab-ci.yml +19 −11 Original line number Diff line number Diff line Loading @@ -19,6 +19,16 @@ before_script: - export GRADLE_USER_HOME=$(pwd)/.gradle - chmod +x ./gradlew .default_before_script: &default_before_script - echo sdk.dir $ANDROID_HOME > local.properties - echo mapbox.key $MAPBOX_KEY >> local.properties - echo mapbox.enabled true >> local.properties - echo ichnaea.key $ICHNAEA_KEY >> local.properties - echo stadia.key $STADIA_KEY >> local.properties - echo "${KEYSTORE}" | base64 -d > play-services-core/e.keystore - export TERM=dumb - export JAVA_OPTS="-XX:+HeapDumpOnOutOfMemoryError -Xmx4096m" cache: key: ${CI_PROJECT_ID} paths: Loading @@ -31,15 +41,8 @@ build: when: never - when: always before_script: - echo sdk.dir $ANDROID_HOME > local.properties - echo mapbox.key $MAPBOX_KEY >> local.properties - echo mapbox.enabled true >> local.properties - echo modules.nearby=false >> local.properties - echo ichnaea.key $ICHNAEA_KEY >> local.properties - echo stadia.key $STADIA_KEY >> local.properties - echo "${KEYSTORE}" | base64 -d > play-services-core/e.keystore - export TERM=dumb - export JAVA_OPTS="-XX:+HeapDumpOnOutOfMemoryError -Xmx4096m" - *default_before_script - echo modules.nearby false >> local.properties script: - ./gradlew assembleDebug - ./gradlew assembleRelease Loading @@ -47,10 +50,15 @@ build: paths: - play-services-core/build/outputs/apk/ build-release: build-nearby: extends: build stage: build rules: - if: $CI_COMMIT_TAG && $CI_COMMIT_REF_PROTECTED == "true" - when: always before_script: - *default_before_script - echo modules.nearby true >> local.properties script: - ./gradlew assemble Loading @@ -63,6 +71,6 @@ publish: - | curl --fail --output "/dev/null" --silent --show-error \ --header 'Content-Type: application/json' --header "PRIVATE-TOKEN: ${PUBLICATION_TOKEN}" \ --data "{\"ref\":\"${CI_COMMIT_SHA}\",\"name\":\"${CI_COMMIT_TAG}\",\"tag_name\":\"${CI_COMMIT_TAG}\",\"description\":\"${CI_COMMIT_TITLE}\",\"assets\":{\"links\":[{\"name\":\"GmsCore-test.apk\",\"url\":\"https://gitlab.e.foundation/api/v4/projects/149/jobs/artifacts/${CI_COMMIT_TAG}/raw/play-services-core/build/outputs/apk/withMapboxWithNearby/releaseTest/play-services-core-withMapbox-withNearby-releaseTest.apk?job=build-release\",\"link_type\":\"package\"},{\"name\":\"GmsCore-dev.apk\",\"url\":\"https://gitlab.e.foundation/api/v4/projects/149/jobs/artifacts/${CI_COMMIT_TAG}/raw/play-services-core/build/outputs/apk/withMapboxWithNearby/releaseDev/play-services-core-withMapbox-withNearby-releaseDev.apk?job=build-release\",\"link_type\":\"package\"},{\"name\":\"GmsCore-stable.apk\",\"url\":\"https://gitlab.e.foundation/api/v4/projects/149/jobs/artifacts/${CI_COMMIT_TAG}/raw/play-services-core/build/outputs/apk/withMapboxWithNearby/releaseStable/play-services-core-withMapbox-withNearby-releaseStable.apk?job=build-release\",\"link_type\":\"package\"}]}}" \ --data "{\"ref\":\"${CI_COMMIT_SHA}\",\"name\":\"${CI_COMMIT_TAG}\",\"tag_name\":\"${CI_COMMIT_TAG}\",\"description\":\"${CI_COMMIT_TITLE}\",\"assets\":{\"links\":[{\"name\":\"GmsCore-test.apk\",\"url\":\"https://gitlab.e.foundation/api/v4/projects/149/jobs/artifacts/${CI_COMMIT_TAG}/raw/play-services-core/build/outputs/apk/mapboxDefault/releaseTest/play-services-core-withMapbox-withNearby-releaseTest.apk?job=build-nearby\",\"link_type\":\"package\"},{\"name\":\"GmsCore-dev.apk\",\"url\":\"https://gitlab.e.foundation/api/v4/projects/149/jobs/artifacts/${CI_COMMIT_TAG}/raw/play-services-core/build/outputs/apk/mapboxDefault/releaseDev/play-services-core-mapbox-default-releaseDev.apk?job=build-nearby\",\"link_type\":\"package\"},{\"name\":\"GmsCore-stable.apk\",\"url\":\"https://gitlab.e.foundation/api/v4/projects/149/jobs/artifacts/${CI_COMMIT_TAG}/raw/play-services-core/build/outputs/apk/mapboxDefault/releaseStable/play-services-core-mapbox-default-releaseStable.apk?job=build-nearby\",\"link_type\":\"package\"}]}}" \ --request POST https://gitlab.e.foundation/api/v4/projects/149/releases