diff --git a/android/scripts/common.sh b/android/scripts/common.sh index d9f1fce35..9a0c35fb0 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 f3a369045..0a43ebd85 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 8dd89f5fd..ddc6fa58c 100644 --- a/travis/travis-resources.template +++ b/travis/travis-resources.template @@ -83,15 +83,6 @@ "PolicyName": "android", "PolicyDocument": { "Statement": [ - { - "Effect": "Allow", - "Action": [ - "s3:GetObject" - ], - "Resource": [ - "arn:aws:s3:::android-gl-build/*" - ] - }, { "Effect": "Allow", "Action": [