summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--circle.yml26
2 files changed, 27 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 79eeb6f910..5c521d674a 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ ifeq ($(V), 1)
export XCPRETTY
NINJA_ARGS ?= -v
else
- export XCPRETTY ?= | xcpretty
+ export XCPRETTY ?= | tee '$(shell pwd)/build/xcodebuild-$(shell date +"%Y-%m-%d_%H%M%S").log' | xcpretty
NINJA_ARGS ?=
endif
diff --git a/circle.yml b/circle.yml
index 90cf825586..789f6b0406 100644
--- a/circle.yml
+++ b/circle.yml
@@ -224,6 +224,18 @@ step-library:
path: mapbox-gl-js/test/integration/render-tests/index-recycle-map.html
destination: render-tests
+ - &collect-xcode-build-logs
+ run:
+ name: Collect Xcode build logs
+ when: always
+ command: |
+ export XCODE_LOG_DIR=build/logs
+ mkdir -p $XCODE_LOG_DIR
+ cp build/*.log $XCODE_LOG_DIR
+ - &upload-xcode-build-logs
+ store_artifacts:
+ path: build/logs
+
jobs:
nitpick:
docker:
@@ -731,6 +743,8 @@ jobs:
command: scripts/nitpick/generated-code.js darwin
- *show-ccache-stats
- *save-cache
+ - *collect-xcode-build-logs
+ - *upload-xcode-build-logs
# ------------------------------------------------------------------------------
ios-sanitize:
@@ -750,6 +764,8 @@ jobs:
command: make ios-sanitize
- *show-ccache-stats
- *save-cache
+ - *collect-xcode-build-logs
+ - *upload-xcode-build-logs
# ------------------------------------------------------------------------------
ios-sanitize-address:
@@ -769,6 +785,8 @@ jobs:
command: make ios-sanitize-address
- *show-ccache-stats
- *save-cache
+ - *collect-xcode-build-logs
+ - *upload-xcode-build-logs
# ------------------------------------------------------------------------------
ios-static-analyzer:
@@ -788,6 +806,8 @@ jobs:
command: make ios-static-analyzer
- *show-ccache-stats
- *save-cache
+ - *collect-xcode-build-logs
+ - *upload-xcode-build-logs
# ------------------------------------------------------------------------------
ios-release:
@@ -843,6 +863,8 @@ jobs:
- store_artifacts:
path: test/fixtures
destination: test/fixtures
+ - *collect-xcode-build-logs
+ - *upload-xcode-build-logs
# ------------------------------------------------------------------------------
macos-debug-qt5:
@@ -889,6 +911,8 @@ jobs:
- *run-node-macos-tests
- *publish-node-package
- *upload-render-tests
+ - *collect-xcode-build-logs
+ - *upload-xcode-build-logs
# ------------------------------------------------------------------------------
macos-release-node6:
@@ -910,3 +934,5 @@ jobs:
- *run-node-macos-tests
- *publish-node-package
- *upload-render-tests
+ - *collect-xcode-build-logs
+ - *upload-xcode-build-logs