summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Wray <jason@mapbox.com>2018-04-09 19:26:35 -0400
committerJason Wray <jason@mapbox.com>2018-04-10 14:23:39 -0400
commit4140303ec9d8246d648c766a84e6a92982206861 (patch)
tree8c3047f88a4dc693b09a5a4ccfeb6d00702ee1c3
parentb11241ba4d92764172923712e84fb0b4890750a7 (diff)
downloadqtlocation-mapboxgl-upstream/fb-circleci-xcode-9.3.0.tar.gz
[build, qt] Work around for chown'ing /usr/localupstream/fb-circleci-xcode-9.3.0
macOS 10.13 no longer allows wholesale chown'ing of /usr/local (and this approach also works in 10.12).
-rw-r--r--circle.yml9
1 files changed, 3 insertions, 6 deletions
diff --git a/circle.yml b/circle.yml
index 0419d305c1..5f06791cd6 100644
--- a/circle.yml
+++ b/circle.yml
@@ -151,8 +151,7 @@ step-library:
run:
name: Install macOS dependencies
command: |
- brew install cmake
- brew install ccache
+ brew install cmake ccache
- &install-macos-node4-dependencies
run:
@@ -172,14 +171,12 @@ step-library:
run:
name: Install macOS Qt dependencies
command: |
- sudo chown -R $USER /usr/local
brew install qt
brew link qt --force
- brew linkapps qt
export HOMEBREW_QT5_CELLAR=$(brew --cellar qt)
export HOMEBREW_QT5_VERSION=$(brew list --versions qt | rev | cut -d' ' -f1 | rev)
- ln -s $HOMEBREW_QT5_CELLAR/$HOMEBREW_QT5_VERSION/mkspecs /usr/local/mkspecs
- ln -s $HOMEBREW_QT5_CELLAR/$HOMEBREW_QT5_VERSION/plugins /usr/local/plugins
+ sudo ln -s $HOMEBREW_QT5_CELLAR/$HOMEBREW_QT5_VERSION/mkspecs /usr/local/mkspecs
+ sudo ln -s $HOMEBREW_QT5_CELLAR/$HOMEBREW_QT5_VERSION/plugins /usr/local/plugins
- &run-node-macos-tests
run: