Commit 4014dd7e authored by Jacob Vosmaer's avatar Jacob Vosmaer

Merge branch 'fix-update-osx-phantomjs' into 'master'

Change phantomjs requirement to 192 for OS X installs. Fixes #79



See merge request !99
parents 113f297f f9a52ab7
......@@ -5,6 +5,7 @@ repositories/
gitlab/
gitlab-ci/
gitlab-runner/
gitlab-ci-multi-runner/
Procfile
postgresql/data
postgresql/.s.*
......
......@@ -89,9 +89,9 @@ Please read [the prerequisites for all platforms](#prerequisites-for-all-platfor
```
brew tap homebrew/dupes
brew tap homebrew/versions
brew install git redis postgresql phantomjs198 libiconv icu4c pkg-config cmake nodejs go openssl
brew link phantomjs198
brew install git redis postgresql libiconv icu4c pkg-config cmake nodejs go openssl node npm
bundle config build.nokogiri --with-iconv-dir=/usr/local/opt/libiconv
npm install phantomjs@1.9.8 -g
```
##### Ubuntu
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment