diff options
| author | Ash McKenzie <amckenzie@gitlab.com> | 2019-07-15 02:55:11 +0300 |
|---|---|---|
| committer | Ash McKenzie <amckenzie@gitlab.com> | 2019-07-15 02:55:11 +0300 |
| commit | 816cf5875d8584543a903c90d92d88ae23b1264d (patch) | |
| tree | af7b7072a458df965bb8a95de70835aeb9c8e1a4 | |
| parent | 5ada9a176a1e0da079bbb6997ee4a280c487b4fb (diff) | |
| parent | 6276b67fda66ce36c8d301b0805389e561018eda (diff) | |
Merge branch 'pin-icu4c' into 'master'
Pin icu4c and readline during MacOS setup
See merge request gitlab-org/gitlab-development-kit!708
| -rw-r--r-- | doc/prepare.md | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/prepare.md b/doc/prepare.md index f9535c8ba58..2bfba987a74 100644 --- a/doc/prepare.md +++ b/doc/prepare.md @@ -46,12 +46,13 @@ We are using PostgreSQL 10 in the following example. If you want to use another | We recommend manual installation of Node.js LTS instead of using Homebrew to avoid breaking your development setup when you run `brew upgrade`. Install Node.js 12.x [manually](https://nodejs.org/en/download/) or use a tool like [NVM](https://github.com/creationix/nvm). If you want to use Homebrew, you can prevent it from upgrading the current Node.js formula by pinning it with `brew pin node@12`. | ``` -brew install git redis postgresql@10 libiconv pkg-config cmake go openssl coreutils re2 graphicsmagick node@12 gpg runit +brew install git redis postgresql@10 libiconv pkg-config cmake go openssl coreutils re2 graphicsmagick node@12 gpg runit icu4c brew install yarn --ignore-dependencies brew link pkg-config brew pin node@12 bundle config build.eventmachine --with-cppflags=-I/usr/local/opt/openssl/include echo 'export PATH="/usr/local/opt/postgresql@10/bin:/usr/local/opt/node@12/bin:$PATH"' >> ~/.bash_profile +echo 'export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig:$PKG_CONFIG_PATH"' >> ~/.bash_profile source ~/.bash_profile brew cask install google-chrome chromedriver ``` |