summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobrun <tobrun.van.nuland@gmail.com>2017-12-13 16:37:41 +0100
committerKonstantin Käfer <mail@kkaefer.com>2017-12-15 12:20:57 +0100
commita95bc2c7e128295e723e1f380297de5ba4978fdd (patch)
treee7e39600b2d072de558d026f97d5e99019ca27dd
parent40f20a1339002be46888d3d43f756c0a6690ce12 (diff)
downloadqtlocation-mapboxgl-upstream/tvn-bump-ci-images.tar.gz
[all] update CI imagesupstream/tvn-bump-ci-images
-rw-r--r--circle.yml28
-rw-r--r--platform/android/dependencies.gradle2
2 files changed, 15 insertions, 15 deletions
diff --git a/circle.yml b/circle.yml
index 6f9b3af05e..4bd2f9ae17 100644
--- a/circle.yml
+++ b/circle.yml
@@ -216,7 +216,7 @@ jobs:
# ------------------------------------------------------------------------------
clang-tidy:
docker:
- - image: mbgl/de3c86c2ff:linux-clang-3.9
+ - image: mbgl/7d2403f42e:linux-clang-3.9
working_directory: /src
environment:
LIBSYSCONFCPUS: 4
@@ -242,7 +242,7 @@ jobs:
# ------------------------------------------------------------------------------
android-debug-arm-v7:
docker:
- - image: mbgl/de3c86c2ff:android-ndk-r16
+ - image: mbgl/7d2403f42e:android-ndk-r16b
resource_class: large
working_directory: /src
environment:
@@ -334,7 +334,7 @@ jobs:
# ------------------------------------------------------------------------------
android-release-all:
docker:
- - image: mbgl/ci@sha256:c34e221294d81da80918d3e9a9df5de795b067e88f86d7c9a5e262763332536e
+ - image: mbgl/7d2403f42e:android-ndk-r16b
resource_class: large
working_directory: /src
environment:
@@ -381,7 +381,7 @@ jobs:
# ------------------------------------------------------------------------------
node4-clang39-release:
docker:
- - image: mbgl/de3c86c2ff:linux-clang-3.9-node-4
+ - image: mbgl/7d2403f42e:linux-clang-3.9-node-4
working_directory: /src
environment:
LIBSYSCONFCPUS: 4
@@ -404,7 +404,7 @@ jobs:
# ------------------------------------------------------------------------------
node6-clang39-release:
docker:
- - image: mbgl/de3c86c2ff:linux-clang-3.9
+ - image: mbgl/7d2403f42e:linux-clang-3.9
working_directory: /src
environment:
LIBSYSCONFCPUS: 4
@@ -427,7 +427,7 @@ jobs:
# ------------------------------------------------------------------------------
node6-gcc6-debug:
docker:
- - image: mbgl/de3c86c2ff:linux-gcc-6
+ - image: mbgl/7d2403f42e:linux-gcc-6
resource_class: large
working_directory: /src
environment:
@@ -450,7 +450,7 @@ jobs:
# ------------------------------------------------------------------------------
linux-clang39-debug:
docker:
- - image: mbgl/de3c86c2ff:linux-clang-3.9
+ - image: mbgl/7d2403f42e:linux-clang-3.9
working_directory: /src
environment:
LIBSYSCONFCPUS: 4
@@ -472,7 +472,7 @@ jobs:
# ------------------------------------------------------------------------------
linux-clang4-sanitize-address:
docker:
- - image: mbgl/de3c86c2ff:linux-clang-4
+ - image: mbgl/7d2403f42e:linux-clang-4
working_directory: /src
environment:
LIBSYSCONFCPUS: 4
@@ -502,7 +502,7 @@ jobs:
# ------------------------------------------------------------------------------
linux-clang4-sanitize-undefined:
docker:
- - image: mbgl/de3c86c2ff:linux-clang-4
+ - image: mbgl/7d2403f42e:linux-clang-4
working_directory: /src
environment:
LIBSYSCONFCPUS: 4
@@ -532,7 +532,7 @@ jobs:
# ------------------------------------------------------------------------------
linux-clang4-sanitize-thread:
docker:
- - image: mbgl/de3c86c2ff:linux-clang-4
+ - image: mbgl/7d2403f42e:linux-clang-4
working_directory: /src
environment:
LIBSYSCONFCPUS: 4
@@ -562,7 +562,7 @@ jobs:
# ------------------------------------------------------------------------------
linux-gcc4.9-debug:
docker:
- - image: mbgl/de3c86c2ff:linux-gcc-4.9
+ - image: mbgl/7d2403f42e:linux-gcc-4.9
resource_class: large
working_directory: /src
environment:
@@ -587,7 +587,7 @@ jobs:
# ------------------------------------------------------------------------------
linux-gcc5-debug-coverage:
docker:
- - image: mbgl/de3c86c2ff:linux-gcc-5
+ - image: mbgl/7d2403f42e:linux-gcc-5
resource_class: large
working_directory: /src
environment:
@@ -615,7 +615,7 @@ jobs:
# ------------------------------------------------------------------------------
linux-gcc5-release-qt4:
docker:
- - image: mbgl/de3c86c2ff:linux-gcc-5-qt-4
+ - image: mbgl/7d2403f42e:linux-gcc-5-qt-4
resource_class: large
working_directory: /src
environment:
@@ -643,7 +643,7 @@ jobs:
# ------------------------------------------------------------------------------
linux-gcc5-release-qt5:
docker:
- - image: mbgl/de3c86c2ff:linux-gcc-5-qt-5.9
+ - image: mbgl/7d2403f42e:linux-gcc-5-qt-5.9
resource_class: large
working_directory: /src
environment:
diff --git a/platform/android/dependencies.gradle b/platform/android/dependencies.gradle
index 1265aa9fb2..687ef09fb0 100644
--- a/platform/android/dependencies.gradle
+++ b/platform/android/dependencies.gradle
@@ -2,7 +2,7 @@ ext {
minSdkVersion = 15
targetSdkVersion = 25
compileSdkVersion = 25
- buildToolsVersion = "25.0.2"
+ buildToolsVersion = "25.0.3"
versionCode = 12
versionName = "6.0.0"