summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Wray <jason@mapbox.com>2019-03-26 13:53:33 -0700
committerJason Wray <jason@mapbox.com>2019-04-03 15:56:22 -0700
commit0d31a2ff1d23cf8cf2414a14e8d57ab2b31d9882 (patch)
tree8dc59ff100a63fd443be4b6b135718c3acdec4b8
parent0f416fbbde9b146eb28a4bf88586738d12505007 (diff)
downloadqtlocation-mapboxgl-0d31a2ff1d23cf8cf2414a14e8d57ab2b31d9882.tar.gz
[darwin, build] Update CircleCI to Xcode 10.2
Except macos-debug, which has issues compiling some files.
-rw-r--r--circle.yml39
1 files changed, 6 insertions, 33 deletions
diff --git a/circle.yml b/circle.yml
index 21f3c023ca..3d261cf798 100644
--- a/circle.yml
+++ b/circle.yml
@@ -44,8 +44,6 @@ workflows:
- linux-gcc5-debug-coverage
- linux-doxygen
- ios-debug
- - ios-debug-xcode-102:
- name: ios-debug-xcode-10.2
- ios-release-template:
name: ios-release
- ios-release-tag:
@@ -752,7 +750,7 @@ jobs:
# ------------------------------------------------------------------------------
node-macos-release:
macos:
- xcode: "10.1.0"
+ xcode: "10.2.0"
environment:
BUILDTYPE: RelWithDebInfo
HOMEBREW_NO_AUTO_UPDATE: 1
@@ -914,31 +912,6 @@ jobs:
# ------------------------------------------------------------------------------
ios-debug:
macos:
- xcode: "10.1.0"
- environment:
- BUILDTYPE: Debug
- HOMEBREW_NO_AUTO_UPDATE: 1
- steps:
- - install-macos-dependencies
- - install-dependencies
- - build-ios-test
- - check-public-symbols
- - run:
- name: Check symbol namespacing for mapbox-events-ios
- command: make ios-check-events-symbols
- - run:
- name: Lint plist files
- command: make ios-lint
- - run:
- name: Nitpick Darwin code generation
- command: scripts/nitpick/generated-code.js darwin
- - save-dependencies
- - collect-xcode-build-logs
- - upload-xcode-build-logs
-
-# ------------------------------------------------------------------------------
- ios-debug-xcode-102:
- macos:
xcode: "10.2.0"
environment:
BUILDTYPE: Debug
@@ -979,7 +952,7 @@ jobs:
# ------------------------------------------------------------------------------
ios-sanitize-nightly:
macos:
- xcode: "10.1.0"
+ xcode: "10.2.0"
environment:
BUILDTYPE: Debug
HOMEBREW_NO_AUTO_UPDATE: 1
@@ -1002,7 +975,7 @@ jobs:
# ------------------------------------------------------------------------------
ios-sanitize-address-nightly:
macos:
- xcode: "10.1.0"
+ xcode: "10.2.0"
environment:
BUILDTYPE: Debug
HOMEBREW_NO_AUTO_UPDATE: 1
@@ -1021,7 +994,7 @@ jobs:
# ------------------------------------------------------------------------------
ios-static-analyzer-nightly:
macos:
- xcode: "10.1.0"
+ xcode: "10.2.0"
environment:
BUILDTYPE: Debug
HOMEBREW_NO_AUTO_UPDATE: 1
@@ -1040,7 +1013,7 @@ jobs:
# ------------------------------------------------------------------------------
ios-release-template:
macos:
- xcode: "10.1.0"
+ xcode: "10.2.0"
environment:
BUILDTYPE: Release
HOMEBREW_NO_AUTO_UPDATE: 1
@@ -1080,7 +1053,7 @@ jobs:
# ------------------------------------------------------------------------------
ios-release-tag:
macos:
- xcode: "10.1.0"
+ xcode: "10.2.0"
environment:
BUILDTYPE: Release
HOMEBREW_NO_AUTO_UPDATE: 1