summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeith Bade <leith@mapbox.com>2015-02-13 17:23:28 -0800
committerLeith Bade <leith@mapbox.com>2015-02-15 09:25:55 -0800
commitc5f380f45dc4ddb789fb2b354a2f8c71b96cd754 (patch)
tree2c31e66cf15e813a438a5df8bd62c3c6385457b4
parentb1deba8d95bf949899d9746e6a041b35144ebce5 (diff)
downloadqtlocation-mapboxgl-c5f380f45dc4ddb789fb2b354a2f8c71b96cd754.tar.gz
Move to mapbox bucket
-rw-r--r--package.json2
-rw-r--r--travis/travis-resources.template78
2 files changed, 61 insertions, 19 deletions
diff --git a/package.json b/package.json
index ff8b301d6d..c60a03c382 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
},
"devDependencies": {
"aws-sdk": "^2.1.9",
- "mapbox-gl-test-suite": "git://github.com/mapbox/mapbox-gl-test-suite",
+ "mapbox-gl-test-suite": "git://github.com/mapbox/mapbox-gl-test-suite#master",
"mkdirp": "^0.5.0",
"tap-spec": "^2.2.1",
"tape": "^3.5.0"
diff --git a/travis/travis-resources.template b/travis/travis-resources.template
index 8f07f1cf2e..ad62b03f87 100644
--- a/travis/travis-resources.template
+++ b/travis/travis-resources.template
@@ -28,7 +28,7 @@
}
},
{
- "PolicyName": "build-testing",
+ "PolicyName": "build-testing-old",
"PolicyDocument": {
"Statement": [
{
@@ -47,22 +47,24 @@
]
}
},
- "PolicyName": "list",
- "PolicyDocument": {
- "Statement": [
- {
- "Action": [
- "s3:ListBucket"
- ],
- "Resource": [
- "arn:aws:s3:::mapbox-node-binary"
- ],
- "Effect": "Allow"
- }
- ]
- }
{
- "PolicyName": "list-testing",
+ "PolicyName": "list",
+ "PolicyDocument": {
+ "Statement": [
+ {
+ "Action": [
+ "s3:ListBucket"
+ ],
+ "Resource": [
+ "arn:aws:s3:::mapbox-node-binary"
+ ],
+ "Effect": "Allow"
+ }
+ ]
+ }
+ },
+ {
+ "PolicyName": "list-testing-old",
"PolicyDocument": {
"Statement": [
{
@@ -76,6 +78,47 @@
}
]
}
+ },
+ {
+ "PolicyName": "list-testing",
+ "PolicyDocument": {
+ "Statement": [
+ {
+ "Action": [
+ "s3:ListBucket"
+ ],
+ "Effect": "Allow",
+ "Resource": [
+ "arn:aws:s3:::mapbox"
+ ],
+ "Condition": {
+ "StringLike": {
+ "s3:prefix": "node-mapbox-gl-native/*"
+ }
+ }
+ }
+ ]
+ }
+ },
+ {
+ "PolicyName": "build-testing",
+ "PolicyDocument": {
+ "Statement": [
+ {
+ "Action": [
+ "s3:DeleteObject",
+ "s3:GetObject",
+ "s3:GetObjectAcl",
+ "s3:PutObject",
+ "s3:PutObjectAcl"
+ ],
+ "Effect": "Allow",
+ "Resource": [
+ "arn:aws:s3:::mapbox/node-mapbox-gl-native/*"
+ ]
+ }
+ ]
+ }
}
]
}
@@ -97,7 +140,7 @@
},
"SecretAccessKey": {
"Value": {
- "Fn::GetAtt": [
+ "Fn::GetAtt": [
"BuildUserKey",
"SecretAccessKey"
]
@@ -105,4 +148,3 @@
}
}
}
-