summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzmiao <miao.zhao@mapbox.com>2020-01-13 14:42:59 +0200
committerzmiao <miao.zhao@mapbox.com>2020-01-21 16:55:02 +0200
commit1dd310a4483102fef6ce09688b9797cba4925a0d (patch)
treeeecc4fd9b0ff0e6713ca32661aeeb8da3c1aadf7
parentcafdd4e027bddfca1e0e006c38e72d3c57b68f6f (diff)
downloadqtlocation-mapboxgl-1dd310a4483102fef6ce09688b9797cba4925a0d.tar.gz
add parameter to config macos if extra environment is needed or not
-rw-r--r--circle.yml17
1 files changed, 14 insertions, 3 deletions
diff --git a/circle.yml b/circle.yml
index e6d8933983..bc097ed99c 100644
--- a/circle.yml
+++ b/circle.yml
@@ -237,13 +237,23 @@ commands:
command: |
Xvfb :99 -noreset -screen 0 1280x1024x24
next-prepare-macos:
+ parameters:
+ build-ios-test-runner:
+ type: boolean
+ default: false
steps:
- run:
name: Prepare macOS
command: |
brew install cmake ccache glfw ninja pkgconfig qt
- brew cask install google-cloud-sdk
- brew install chargepoint/xcparse/xcparse
+ - when:
+ condition: << parameters.build-ios-test-runner >>
+ steps:
+ - run:
+ name: Prepare macOS with extra environment
+ command: |
+ brew cask install google-cloud-sdk
+ brew install chargepoint/xcparse/xcparse
- run:
name: Code Generators macOS
command: |
@@ -686,7 +696,8 @@ jobs:
steps:
- checkout
- next-prepare
- - next-prepare-macos
+ - next-prepare-macos:
+ build-ios-test-runner: true
- run:
name: Prepare codesign keychain
command: |