diff options
Diffstat (limited to 'circle.yml')
| -rw-r--r-- | circle.yml | 55 |
1 files changed, 27 insertions, 28 deletions
diff --git a/circle.yml b/circle.yml index 76190f27be..36840e5856 100644 --- a/circle.yml +++ b/circle.yml @@ -14,20 +14,20 @@ workflows: filters: tags: only: /node-.*/ - - node6-clang39-release: + - node6-clang4-release: filters: tags: only: /node-.*/ - - node6-clang39-debug: + - node6-gcc6-debug: filters: tags: only: /node-.*/ - linux-clang39-debug - - linux-clang4-sanitize-address - - linux-clang4-sanitize-undefined - - linux-clang4-sanitize-thread + - linux-clang5-sanitize-address + - linux-clang5-sanitize-undefined + - linux-clang5-sanitize-thread - linux-gcc4.9-debug - - linux-gcc5-debug-coverage + - linux-gcc6-debug-coverage - linux-gcc5-release-qt4 - linux-gcc5-release-qt5 - ios-debug @@ -216,7 +216,7 @@ jobs: # ------------------------------------------------------------------------------ clang-tidy: docker: - - image: mbgl/de3c86c2ff:linux-clang-3.9 + - image: mbgl/de3c86c2ff:linux-clang-5 working_directory: /src environment: LIBSYSCONFCPUS: 4 @@ -402,9 +402,9 @@ jobs: - *upload-render-tests # ------------------------------------------------------------------------------ - node6-clang39-release: + node6-clang4-release: docker: - - image: mbgl/de3c86c2ff:linux-clang-3.9 + - image: mbgl/de3c86c2ff:linux-clang-4 working_directory: /src environment: LIBSYSCONFCPUS: 4 @@ -425,16 +425,15 @@ jobs: - *upload-render-tests # ------------------------------------------------------------------------------ - node6-clang39-debug: + node6-gcc6-debug: docker: - - image: mbgl/de3c86c2ff:linux-clang-3.9 + - image: mbgl/de3c86c2ff:linux-gcc-6 working_directory: /src environment: - LIBSYSCONFCPUS: 4 - JOBS: 4 + LIBSYSCONFCPUS: 2 + JOBS: 2 BUILDTYPE: Debug WITH_EGL: 1 - WITH_CXX11ABI: 0 steps: - checkout - *generate-cache-key @@ -470,9 +469,9 @@ jobs: - *run-unit-tests # ------------------------------------------------------------------------------ - linux-clang4-sanitize-address: + linux-clang5-sanitize-address: docker: - - image: mbgl/de3c86c2ff:linux-clang-4 + - image: mbgl/de3c86c2ff:linux-clang-5 working_directory: /src environment: LIBSYSCONFCPUS: 4 @@ -500,9 +499,9 @@ jobs: [ -z "$(sed -n '/^SUMMARY: AddressSanitizer:/p' sanitizer)" ] # ------------------------------------------------------------------------------ - linux-clang4-sanitize-undefined: + linux-clang5-sanitize-undefined: docker: - - image: mbgl/de3c86c2ff:linux-clang-4 + - image: mbgl/de3c86c2ff:linux-clang-5 working_directory: /src environment: LIBSYSCONFCPUS: 4 @@ -530,9 +529,9 @@ jobs: [ -z "$(sed -n '/^SUMMARY: UndefinedBehaviorSanitizer:/p' sanitizer)" ] # ------------------------------------------------------------------------------ - linux-clang4-sanitize-thread: + linux-clang5-sanitize-thread: docker: - - image: mbgl/de3c86c2ff:linux-clang-4 + - image: mbgl/de3c86c2ff:linux-clang-5 working_directory: /src environment: LIBSYSCONFCPUS: 4 @@ -566,7 +565,7 @@ jobs: resource_class: large working_directory: /src environment: - LIBSYSCONFCPUS: 4 + LIBSYSCONFCPUS: 2 JOBS: 2 BUILDTYPE: Debug WITH_EGL: 1 @@ -585,13 +584,13 @@ jobs: - *run-unit-tests # ------------------------------------------------------------------------------ - linux-gcc5-debug-coverage: + linux-gcc6-debug-coverage: docker: - - image: mbgl/de3c86c2ff:linux-gcc-5 + - image: mbgl/de3c86c2ff:linux-gcc-6 resource_class: large working_directory: /src environment: - LIBSYSCONFCPUS: 4 + LIBSYSCONFCPUS: 2 JOBS: 2 BUILDTYPE: Debug WITH_EGL: 1 @@ -619,8 +618,8 @@ jobs: resource_class: large working_directory: /src environment: - LIBSYSCONFCPUS: 4 - JOBS: 2 # OOM, causing the compiler to crash. + LIBSYSCONFCPUS: 2 + JOBS: 2 BUILDTYPE: Release GTEST_OUTPUT: xml LD_PRELOAD: /usr/lib/x86_64-linux-gnu/libjemalloc.so @@ -647,8 +646,8 @@ jobs: resource_class: large working_directory: /src environment: - LIBSYSCONFCPUS: 4 - JOBS: 2 # OOM, causing the compiler to crash. + LIBSYSCONFCPUS: 2 + JOBS: 2 BUILDTYPE: Release WITH_QT_I18N: 1 steps: |