diff options
| author | Leith Bade <leith@mapbox.com> | 2014-12-26 18:18:56 +1300 |
|---|---|---|
| committer | Leith Bade <leith@mapbox.com> | 2014-12-26 18:18:56 +1300 |
| commit | 06fdecfc2f2be4062f52e10d78f663268dde61d3 (patch) | |
| tree | d97e8f38349498b401f953cccbf1bd5b7f8ec514 | |
| parent | c852a9c2a4472b3ca553129a45364c3c69c5205f (diff) | |
| download | qtlocation-mapboxgl-06fdecfc2f2be4062f52e10d78f663268dde61d3.tar.gz | |
Change to bucket in production
| -rwxr-xr-x | android/scripts/common.sh | 4 | ||||
| -rwxr-xr-x | android/scripts/run-build.sh | 4 | ||||
| -rw-r--r-- | travis/travis-resources.template | 9 |
3 files changed, 4 insertions, 13 deletions
diff --git a/android/scripts/common.sh b/android/scripts/common.sh index d9f1fce35c..9a0c35fb0a 100755 --- a/android/scripts/common.sh +++ b/android/scripts/common.sh @@ -16,5 +16,5 @@ echo "${MAPBOX_ACCESS_TOKEN}" >> ./android/java/app/src/main/res/raw/token.txt make android BUILDTYPE=$BUILDTYPE -aws s3 cp ./android/java/app/build/outputs/apk/app-debug.apk s3://android-gl-build/${NAME}/app-debug.apk -aws s3 cp ./android/java/app/build/outputs/apk/app-release-unsigned.apk s3://android-gl-build/${NAME}/app-release-unsigned.apk +aws s3 cp ./android/java/app/build/outputs/apk/app-debug.apk s3://mapbox-gl-testing/android/${NAME}/app-debug.apk +aws s3 cp ./android/java/app/build/outputs/apk/app-release-unsigned.apk s3://mapbox-gl-testing/android/${NAME}/app-release-unsigned.apk diff --git a/android/scripts/run-build.sh b/android/scripts/run-build.sh index f3a369045c..0a43ebd857 100755 --- a/android/scripts/run-build.sh +++ b/android/scripts/run-build.sh @@ -34,7 +34,7 @@ user_data="#!/bin/bash fi popd - aws s3 cp --region us-east-1 build.log s3://android-gl-build/${NAME}/build-log.txt + aws s3 cp --region us-east-1 build.log s3://mapbox-gl-testing/android/${NAME}/build-log.txt shutdown -P now" id=$(aws ec2 run-instances \ @@ -62,7 +62,7 @@ echo "Build finished" output=$(aws ec2 get-console-output --region $region --instance-id $id | jq -r '.Output') -aws s3 cp --region $region s3://android-gl-build/${NAME}/build-log.txt build.log +aws s3 cp --region $region s3://mapbox-gl-testing/android/${NAME}/build-log.txt build.log cat build.log if [[ $output == *"ANDROID BUILD PASSED"* ]]; then diff --git a/travis/travis-resources.template b/travis/travis-resources.template index 8dd89f5fd0..ddc6fa58cc 100644 --- a/travis/travis-resources.template +++ b/travis/travis-resources.template @@ -86,15 +86,6 @@ { "Effect": "Allow", "Action": [ - "s3:GetObject" - ], - "Resource": [ - "arn:aws:s3:::android-gl-build/*" - ] - }, - { - "Effect": "Allow", - "Action": [ "ec2:DescribeInstances", "ec2:RunInstances", "ec2:CreateTags", |