testupstream/clang-tidy-update

2 files changed, 11 insertions, 70 deletions

diff --git a/circle.yml b/circle.yml
index b47281cf26..576417bf74 100644
--- a/circle.yml
+++ b/circle.yml
@@ -4,71 +4,7 @@ workflows:
   version: 2
   default:
     jobs:
-      - nitpick
-      - clang-tidy:
-          filters:
-            branches:
-              ignore: master
-      - android-debug-arm-v7-buck
-      - android-arm-template:
-          name: android-debug-arm-v8
-      - android-arm-template:
-          name: android-gnustl-arm-v7
-          stl: gnustl_shared
-          firebase_device_id: "cheryl"
-          firebase_device_os: "25"
-          image: android-ndk-r17c:1d5db0eb34
-          abi: arm-v7
-      - android-release:
-          filters:
-            tags:
-              only: /android-v.*/
-      - node-clang39-release:
-          filters:
-            tags:
-              only: /node-.*/
-      - node-gcc8-debug:
-          filters:
-            tags:
-              only: /node-.*/
-      - node-macos-release:
-          filters:
-            tags:
-              only: /node-.*/
-      - linux-clang-38-libcxx-debug:
-          name: linux-clang-3.8-libcxx-debug
-      - linux-clang-7-sanitize-address-undefined
-      - linux-clang-7-sanitize-thread
-      - linux-gcc49-debug:
-          name: linux-gcc4.9-debug
-      - linux-gcc5-debug-coverage
-      - linux-doxygen
-      - ios-debug
-      - ios-release-template:
-          name: ios-release
-      - ios-release-tag:
-          filters:
-            tags:
-              only: /ios-.*/
-            branches:
-              ignore: /.*/
-      - macos-debug
-      - qt5-linux-gcc5-release
-      - qt5-macos-debug
-  nightly:
-    triggers:
-      - schedule:
-          cron: "0 5 * * *"
-          filters:
-            branches:
-              only:
-                - master
-    jobs:
-      - ios-release-template:
-          name: ios-release-nightly
-      - ios-sanitize-nightly
-      - ios-sanitize-address-nightly
-      - ios-static-analyzer-nightly
+      - clang-tidy
 
 commands:
   npm-install:
@@ -487,8 +423,8 @@ jobs:
       - image: mbgl/linux-clang-7:a5a3c52107
     working_directory: /src
     environment:
-      LIBSYSCONFCPUS: 2
-      JOBS: 2
+      LIBSYSCONFCPUS: 8
+      JOBS: 8
       BUILDTYPE: Debug
     steps:
       - install-dependencies: { ccache: false }
@@ -500,8 +436,13 @@ jobs:
           command: make compdb
       - run:
           name: Run Clang checks
-          command: make check
-          no_output_timeout: 20m
+          command: make tidy
+          no_output_timeout: 45m
+      - run:
+          name: Generate diff
+          command: git diff > tidy.diff
+      - store_artifacts:
+          path: tidy.diff
       - save-dependencies: { ccache: false }
 
 # ------------------------------------------------------------------------------
diff --git a/scripts/clang-tools.sh b/scripts/clang-tools.sh
index c5e14cc68f..d22a7c4f12 100755
--- a/scripts/clang-tools.sh
+++ b/scripts/clang-tools.sh
@@ -29,7 +29,7 @@ function run_clang_tidy() {
     ${CLANG_TIDY_PREFIX}/share/run-clang-tidy.py -j ${JOBS} \
         -clang-tidy-binary ${CLANG_TIDY} \
         -clang-apply-replacements-binary ${CLANG_APPLY} \
-        -fix ${FILES} 2>/dev/null || exit 1
+        -fix ${FILES} 2>/dev/null || exit 0
 }
 
 function run_clang_tidy_diff() {