summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2017-07-07 15:02:40 +0300
committerBruno de Oliveira Abinader <bruno@mapbox.com>2017-07-12 20:42:29 +0300
commitc163402f641c9d9b86d5851c6acfbe11c400f15b (patch)
tree9b88128f7bffbcc28dd3aaccd778c1148d1a5ca2
parent3aa807e1dc3c260ea5fb870c119610fc152b9153 (diff)
downloadqtlocation-mapboxgl-c163402f641c9d9b86d5851c6acfbe11c400f15b.tar.gz
[build] Added Linux GCC 4.9 CI bot
-rw-r--r--CMakeLists.txt8
-rw-r--r--circle.yml42
2 files changed, 46 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 694147fc8f..033c289018 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,23 +42,23 @@ endif()
set_source_files_properties(src/mbgl/util/version.cpp PROPERTIES COMPILE_DEFINITIONS MBGL_VERSION_REV="${MBGL_VERSION_REV}")
-mason_use(geometry VERSION 0.9.0 HEADER_ONLY)
+mason_use(geometry VERSION 0.9.2 HEADER_ONLY)
mason_use(variant VERSION 1.1.4 HEADER_ONLY)
mason_use(any VERSION 8fef1e9 HEADER_ONLY)
mason_use(unique_resource VERSION cba309e HEADER_ONLY)
mason_use(rapidjson VERSION 1.1.0 HEADER_ONLY)
mason_use(boost VERSION 1.62.0 HEADER_ONLY)
mason_use(geojsonvt VERSION 6.2.0 HEADER_ONLY)
-mason_use(supercluster VERSION 0.2.0-1 HEADER_ONLY)
+mason_use(supercluster VERSION 0.2.1 HEADER_ONLY)
mason_use(kdbush VERSION 0.1.1-1 HEADER_ONLY)
mason_use(earcut VERSION 0.12.3 HEADER_ONLY)
-mason_use(protozero VERSION 1.4.2 HEADER_ONLY)
+mason_use(protozero VERSION 1.5.2 HEADER_ONLY)
mason_use(pixelmatch VERSION 0.10.0 HEADER_ONLY)
mason_use(geojson VERSION 0.4.0 HEADER_ONLY)
mason_use(polylabel VERSION 1.0.2 HEADER_ONLY)
mason_use(wagyu VERSION 0.4.1 HEADER_ONLY)
mason_use(shelf-pack VERSION 2.1.0 HEADER_ONLY)
-mason_use(cheap-ruler VERSION 2.5.1 HEADER_ONLY)
+mason_use(cheap-ruler VERSION 2.5.3 HEADER_ONLY)
mason_use(vector-tile VERSION 1.0.0-rc6 HEADER_ONLY)
add_definitions(-DRAPIDJSON_HAS_STDSTRING=1)
diff --git a/circle.yml b/circle.yml
index ba4885066e..6620a44541 100644
--- a/circle.yml
+++ b/circle.yml
@@ -11,6 +11,7 @@ workflows:
- node6-clang39-release
- node6-clang39-debug
- linux-clang39-debug
+ - linux-gcc4.9-debug
- linux-gcc5-debug-coverage
- linux-gcc5-release-qt4
- linux-gcc5-release-qt5
@@ -350,6 +351,47 @@ jobs:
- /root/.ccache
# ------------------------------------------------------------------------------
+ linux-gcc4.9-debug:
+ docker:
+ - image: mbgl/ci:r3-linux-gcc-4.9
+ working_directory: /src
+ environment:
+ LIBSYSCONFCPUS: 6
+ JOBS: 2
+ BUILDTYPE: Debug
+ WITH_EGL: 1
+ WITH_CXX11ABI: 0
+ DISPLAY: :0
+ steps:
+ - checkout
+ - restore_cache:
+ key: v1-linux-gcc4.9-debug
+ paths:
+ - node_modules
+ - /root/.ccache
+ - run:
+ name: Build linux
+ command: make linux
+ - run:
+ name: Build benchmark
+ command: make benchmark
+ - run:
+ name: Build test
+ command: make test
+ - run:
+ name: Run tests
+ command: |
+ source scripts/circle_setup.sh
+ mapbox_export_mesa_library_path
+ xvfb-run --server-args="-screen 0 1024x768x24" \
+ make run-test
+ - save_cache:
+ key: v1-linux-gcc4.9-debug
+ paths:
+ - node_modules
+ - /root/.ccache
+
+# ------------------------------------------------------------------------------
linux-gcc5-debug-coverage:
docker:
- image: mbgl/ci:r3-linux-gcc-5