Commit 4b348bfd authored by Daniel Agar's avatar Daniel Agar

travis-ci fix s3 deploy location

parent ea4e7c71
...@@ -153,7 +153,9 @@ before_script: ...@@ -153,7 +153,9 @@ before_script:
# insert QGC version in AndroidManifest.xml # insert QGC version in AndroidManifest.xml
- if [ "${SPEC}" = "android-g++" ]; then - if [ "${SPEC}" = "android-g++" ]; then
tools/update_android_version.sh; git remote set-branches origin 'master' &&
git fetch origin master &&
./tools/update_android_version.sh;
fi fi
script: script:
...@@ -192,15 +194,14 @@ after_success: ...@@ -192,15 +194,14 @@ after_success:
pip install --user google-api-python-client PyOpenSSL && pip install --user google-api-python-client PyOpenSSL &&
echo "Google Play Track:" ${GOOGLE_PLAY_TRACK} && 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 && 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 ${GOOGLE_PLAY_TRACK} org.mavlink.qgroundcontrol ${SHADOW_BUILD_DIR}/release/package/QGroundControl.apk;
;
fi fi
before_deploy: before_deploy:
# create linux appimage # create linux appimage
- cd ${TRAVIS_BUILD_DIR} - cd ${TRAVIS_BUILD_DIR}
- if [[ "${SPEC}" = "linux-g++-64" && "${CONFIG}" = "installer" ]]; then - if [[ "${SPEC}" = "linux-g++-64" && "${CONFIG}" = "installer" ]]; then
deploy/create_linux_appimage.sh ${TRAVIS_BUILD_DIR} ${SHADOW_BUILD_DIR}/release ${SHADOW_BUILD_DIR}/release/package; ./deploy/create_linux_appimage.sh ${TRAVIS_BUILD_DIR} ${SHADOW_BUILD_DIR}/release ${SHADOW_BUILD_DIR}/release/package;
fi fi
deploy: deploy:
...@@ -219,7 +220,7 @@ deploy: ...@@ -219,7 +220,7 @@ deploy:
all_branches: true all_branches: true
condition: $CONFIG = installer condition: $CONFIG = installer
# deploy installers to s3 latest/ if on a tag # deploy tagged installers to s3 latest/
- provider: s3 - provider: s3
access_key_id: AKIAIVORNALE7NHD3T6Q access_key_id: AKIAIVORNALE7NHD3T6Q
secret_access_key: secret_access_key:
...@@ -241,7 +242,7 @@ deploy: ...@@ -241,7 +242,7 @@ deploy:
secure: BsLXeXUPsCJdX4tawrDnO8OFK5Hk4kzlDTiyH93En6TbjUargVAWDMcHVj7TUhr7+3Tao1W1zb0G4SJe9kHv+jrky0yE72KvoG3YAON0VXWKizxBAKkgHE2RxSTNAwDeKbi2G6YJfNDescBBfX7zEohShdXglQu7CGaUQKRaiI4= secure: BsLXeXUPsCJdX4tawrDnO8OFK5Hk4kzlDTiyH93En6TbjUargVAWDMcHVj7TUhr7+3Tao1W1zb0G4SJe9kHv+jrky0yE72KvoG3YAON0VXWKizxBAKkgHE2RxSTNAwDeKbi2G6YJfNDescBBfX7zEohShdXglQu7CGaUQKRaiI4=
bucket: qgroundcontrol bucket: qgroundcontrol
local_dir: ${SHADOW_BUILD_DIR}/release/package local_dir: ${SHADOW_BUILD_DIR}/release/package
upload-dir: builds/${TRAVIS_BRANCH} upload-dir: ${TRAVIS_BRANCH}
acl: public_read acl: public_read
region: us-west-2 region: us-west-2
skip_cleanup: true skip_cleanup: true
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment