Try storing unique logs

Makefile

@@ -45,7 +45,7 @@ ifeq ($(V), 1)
   export XCPRETTY
   NINJA_ARGS ?= -v
 else
-  export XCPRETTY ?= | tee $(shell pwd)/build/xcodebuild.log | bundle exec xcpretty
+  export XCPRETTY ?= | tee $(shell pwd)/build/xcodebuild-$(shell date +"%Y-%m-%d_%H%M%S").log | bundle exec xcpretty
   NINJA_ARGS ?=
 endif
 

circle.yml

@@ -147,6 +147,7 @@ step-library:
         command: |
           brew install cmake
           brew install ccache
+          brew install rsync
 
   - &install-macos-node4-dependencies
       run:
@@ -218,10 +219,18 @@ step-library:
         path: mapbox-gl-js/test/integration/render-tests/index-recycle-map.html
         destination: render-tests
 
-  - &upload-macos-build-logs
+  - &collect-xcode-build-logs
+      run:
+        name: Collect Xcode build logs
+        when: always
+        command: |
+          export XCODE_LOG_DIR=build/logs
+          mkdir $XCODE_LOG_DIR
+          cp build/*.log $XCODE_LOG_DIR
+          rsync -rv --no-relative /var/folders/**/com.apple.dt.XCTest/**/*.log $XCODE_LOG_DIR
+  - &upload-xcode-build-logs
       store_artifacts:
-        path: build/xcodebuild.log
-        destination: build
+        path: build/logs
 
 jobs:
   nitpick:
@@ -727,7 +736,8 @@ jobs:
           command: scripts/nitpick/generated-code.js darwin
       - *show-ccache-stats
       - *save-cache
-      - *upload-macos-build-logs
+      - *collect-xcode-build-logs
+      - *upload-xcode-build-logs
 
 # ------------------------------------------------------------------------------
   ios-sanitize:
@@ -747,7 +757,8 @@ jobs:
           command: make ios-sanitize
       - *show-ccache-stats
       - *save-cache
-      - *upload-macos-build-logs
+      - *collect-xcode-build-logs
+      - *upload-xcode-build-logs
 
 # ------------------------------------------------------------------------------
   ios-sanitize-address:
@@ -767,7 +778,8 @@ jobs:
           command: make ios-sanitize-address
       - *show-ccache-stats
       - *save-cache
-      - *upload-macos-build-logs
+      - *collect-xcode-build-logs
+      - *upload-xcode-build-logs
 
 # ------------------------------------------------------------------------------
   ios-static-analyzer:
@@ -787,7 +799,8 @@ jobs:
           command: make ios-static-analyzer
       - *show-ccache-stats
       - *save-cache
-      - *upload-macos-build-logs
+      - *collect-xcode-build-logs
+      - *upload-xcode-build-logs
 
 # ------------------------------------------------------------------------------
   macos-debug:
@@ -815,7 +828,8 @@ jobs:
       - store_artifacts:
           path: test/fixtures
           destination: test/fixtures
-      - *upload-macos-build-logs
+      - *collect-xcode-build-logs
+      - *upload-xcode-build-logs
 
 # ------------------------------------------------------------------------------
   macos-debug-qt5:
@@ -841,7 +855,8 @@ jobs:
       - store_artifacts:
           path: test/fixtures
           destination: test/fixtures
-      - *upload-macos-build-logs
+      - *collect-xcode-build-logs
+      - *upload-xcode-build-logs
 
 # ------------------------------------------------------------------------------
   macos-release-node4:
@@ -863,7 +878,8 @@ jobs:
       - *run-node-macos-tests
       - *publish-node-package
       - *upload-render-tests
-      - *upload-macos-build-logs
+      - *collect-xcode-build-logs
+      - *upload-xcode-build-logs
 
 # ------------------------------------------------------------------------------
   macos-release-node6:
@@ -885,4 +901,5 @@ jobs:
       - *run-node-macos-tests
       - *publish-node-package
       - *upload-render-tests
-      - *upload-macos-build-logs
+      - *collect-xcode-build-logs
+      - *upload-xcode-build-logs