summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobrun <tobrun.van.nuland@gmail.com>2018-11-07 12:37:38 +0100
committerTobrun <tobrun.van.nuland@gmail.com>2018-11-08 19:55:33 +0100
commita5770308c94be8278c1b0f53b41ef9afaf6cc9d7 (patch)
tree4351eee87aae90778f72575e89c2ebc499c90f6e
parent7b2f6e076e171a4983ebaf2c43570e118a641f8b (diff)
downloadqtlocation-mapboxgl-upstream/tvn-perf-test-config.tar.gz
[all] - update ci configupstream/tvn-perf-test-config
-rw-r--r--ci.template34
-rw-r--r--circle.yml6
-rw-r--r--package.json1
3 files changed, 40 insertions, 1 deletions
diff --git a/ci.template b/ci.template
index db4e59eb7e..bd912d3e83 100644
--- a/ci.template
+++ b/ci.template
@@ -204,6 +204,38 @@
}
]
}
+ },
+ {
+ "PolicyName": "device-farm",
+ "PolicyDocument": {
+ "Statement": [
+ {
+ "Effect": "Allow",
+ "Action": [
+ "devicefarm:*"
+ ],
+ "Resource": [
+ "*"
+ ]
+ }
+ ]
+ }
+ },
+ {
+ "PolicyName": "device-farm-publish-results",
+ "PolicyDocument": {
+ "Statement": [
+ {
+ "Effect": "Allow",
+ "Action": [
+ "s3:PutObject"
+ ],
+ "Resource": [
+ "arn:aws:s3:::mapbox-loading-lock/raw/*"
+ ]
+ }
+ ]
+ }
}
]
}
@@ -266,7 +298,7 @@
}
]
}
- }
+ }
],
"Path": "/android-gl-build/travis/role/"
}
diff --git a/circle.yml b/circle.yml
index 5d1c40bf66..f3715aafde 100644
--- a/circle.yml
+++ b/circle.yml
@@ -515,6 +515,12 @@ jobs:
steps:
- install-dependencies: { gradle: true }
- run:
+ name: Install AWS CLI
+ command: |
+ pip install --upgrade pip
+ pip install awscli --upgrade --user
+ aws devicefarm list-projects --region us-west-2
+ - run:
name: Check code style
command: make android-check
- run:
diff --git a/package.json b/package.json
index ce8262b376..9ba22611fc 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
},
"license": "BSD-2-Clause",
"dependencies": {
+ "@mapbox/cloudfriend": "^2.4.0",
"@mapbox/cmake-node-module": "^1.1.0",
"node-pre-gyp": "^0.10.2",
"npm-run-all": "^4.0.2"