summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Wray <jason@mapbox.com>2018-10-24 16:12:06 -0400
committerJason Wray <jason@mapbox.com>2018-11-02 17:49:33 -0400
commit1c140438cb7d6345a05acecec12cd40142a25d28 (patch)
treeeb38e509ecd02ae4770363aad1e06dc717059602
parentb6909748c1b2437b6206f50e48a630ab443969fb (diff)
downloadqtlocation-mapboxgl-1c140438cb7d6345a05acecec12cd40142a25d28.tar.gz
[build] Update CircleCI jobs to Xcode 10.0
-rw-r--r--circle.yml24
1 files changed, 8 insertions, 16 deletions
diff --git a/circle.yml b/circle.yml
index 75ed80b85d..f12a5fe1b1 100644
--- a/circle.yml
+++ b/circle.yml
@@ -38,12 +38,7 @@ workflows:
- linux-gcc49-debug:
name: linux-gcc4.9-debug
- linux-gcc5-debug-coverage
- - ios-debug-template:
- name: ios-debug
- xcode: "9.4.1"
- - ios-debug-template:
- name: ios-debug-xcode10
- xcode: "10.0.0"
+ - ios-debug
- ios-release-template:
name: ios-release
- ios-release-tag:
@@ -673,7 +668,7 @@ jobs:
# ------------------------------------------------------------------------------
node-macos-release:
macos:
- xcode: "9.4.1"
+ xcode: "10.0.0"
environment:
BUILDTYPE: RelWithDebInfo
HOMEBREW_NO_AUTO_UPDATE: 1
@@ -829,12 +824,9 @@ jobs:
platform/linux/scripts/coveralls.sh
# ------------------------------------------------------------------------------
- ios-debug-template:
- parameters:
- xcode:
- type: string
+ ios-debug:
macos:
- xcode: << parameters.xcode >>
+ xcode: "10.0.0"
environment:
BUILDTYPE: Debug
HOMEBREW_NO_AUTO_UPDATE: 1
@@ -860,7 +852,7 @@ jobs:
# ------------------------------------------------------------------------------
ios-sanitize-nightly:
macos:
- xcode: "9.4.1"
+ xcode: "10.0.0"
environment:
BUILDTYPE: Debug
HOMEBREW_NO_AUTO_UPDATE: 1
@@ -879,7 +871,7 @@ jobs:
# ------------------------------------------------------------------------------
ios-sanitize-address-nightly:
macos:
- xcode: "9.4.1"
+ xcode: "10.0.0"
environment:
BUILDTYPE: Debug
HOMEBREW_NO_AUTO_UPDATE: 1
@@ -898,7 +890,7 @@ jobs:
# ------------------------------------------------------------------------------
ios-static-analyzer-nightly:
macos:
- xcode: "9.4.1"
+ xcode: "10.0.0"
environment:
BUILDTYPE: Debug
HOMEBREW_NO_AUTO_UPDATE: 1
@@ -989,7 +981,7 @@ jobs:
# ------------------------------------------------------------------------------
macos-debug:
macos:
- xcode: "9.4.1"
+ xcode: "10.0.0"
environment:
BUILDTYPE: Debug
HOMEBREW_NO_AUTO_UPDATE: 1