From 68631ceab66b520f0787ca94abb5ea82050a2d50 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Sun, 9 Apr 2017 01:02:51 -0400 Subject: [PATCH] android separate daily build deploy (#4947) --- .travis.yml | 14 +++++--------- resources/icons/android_dev_512x512.png | Bin 0 -> 37988 bytes tools/update_android_version.sh | 10 ++++++++++ 3 files changed, 15 insertions(+), 9 deletions(-) create mode 100644 resources/icons/android_dev_512x512.png diff --git a/.travis.yml b/.travis.yml index 0ba09acd9..56c3554f5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -187,21 +187,17 @@ script: after_success: - cd ${TRAVIS_BUILD_DIR} - # android google play deploy - - export GOOGLE_PLAY_TRACK=none; - # master development builds to beta track # tagged releases first to beta track then manually move to production - if [ "${TRAVIS_TAG}" ]; then - GOOGLE_PLAY_TRACK=beta; - elif [ "${TRAVIS_BRANCH}" = "master" ]; then - GOOGLE_PLAY_TRACK=beta; + GOOGLE_PLAY_PKG=org.mavlink.qgroundcontrol + else + GOOGLE_PLAY_PKG=org.mavlink.qgroundcontrolbeta fi - - if [[ "${SPEC}" = "android-g++" && "${TRAVIS_PULL_REQUEST}" = "false" && "${GOOGLE_PLAY_TRACK}" != "none" ]]; then + - if [[ "${SPEC}" = "android-g++" && "${TRAVIS_PULL_REQUEST}" = "false" && "${TRAVIS_BRANCH}" = "master" ]]; then pip install --user google-api-python-client PyOpenSSL && - echo "Google Play Track:" ${GOOGLE_PLAY_TRACK} && openssl aes-256-cbc -K $encrypted_25db6eb7c3fd_key -iv $encrypted_25db6eb7c3fd_iv -in android/Google_Play_Android_Developer-4432a3c4f5d1.json.enc -out android/Google_Play_Android_Developer-4432a3c4f5d1.json -d && - ./tools/google_play_upload.py ${GOOGLE_PLAY_TRACK} org.mavlink.qgroundcontrol ${SHADOW_BUILD_DIR}/release/package/QGroundControl.apk; + ./tools/google_play_upload.py production ${GOOGLE_PLAY_PKG} ${SHADOW_BUILD_DIR}/release/package/QGroundControl.apk; fi before_deploy: diff --git a/resources/icons/android_dev_512x512.png b/resources/icons/android_dev_512x512.png new file mode 100644 index 0000000000000000000000000000000000000000..41f3695615bedb4c6cfc01371e521f6922f72ea4 GIT binary patch literal 37988 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�m6 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 KMNUMnLSTYAq75Yg literal 0 HcmV?d00001 diff --git a/tools/update_android_version.sh b/tools/update_android_version.sh index 7b98cca2a..58d892d3a 100755 --- a/tools/update_android_version.sh +++ b/tools/update_android_version.sh @@ -10,6 +10,15 @@ VERSIONCODE=$(($(($patch*1000)) + $VERSIONCODE)) VERSIONCODE=$(($(($dev)) + $VERSIONCODE)) MANIFEST_FILE=android/AndroidManifest.xml + +# manifest package +if [ ${#dev} -gt 0 ]; then + QGC_PKG_NAME="org.mavlink.qgroundcontrolbeta" + sed -i -e 's/package *= *"[^"]*"/package="'$QGC_PKG_NAME'"/' $MANIFEST_FILE + echo "Android package name: $QGC_PKG_NAME" +fi + +# android:versionCode if [ -n "$VERSIONCODE" ]; then sed -i -e "s/android:versionCode=\"[0-9][0-9]*\"/android:versionCode=\"$VERSIONCODE\"/" $MANIFEST_FILE echo "Android version: ${VERSIONCODE}" @@ -18,6 +27,7 @@ else exit 0 # don't cause the build to fail fi +# android:versionName if [ -n "$VERSIONNAME" ]; then sed -i -e 's/versionName *= *"[^"]*"/versionName="'$VERSIONNAME'"/' $MANIFEST_FILE echo "Android name: ${VERSIONNAME}" -- 2.22.0