From 6b5c77cf83ff7332b1b7d86eba7644ed1c18bb9c Mon Sep 17 00:00:00 2001 From: Godfrey Chan Date: Wed, 25 Jul 2018 14:17:00 -0700 Subject: [PATCH 1/2] Revert "install imagemagick@6 for OSX native development (#5411)" This reverts commit 0207b7ca581f3e84f75ae456aea560d5513907aa. ImageMagick 7 is now supported (and expected by the test fixtures). See 1d74cca. --- docs/DEVELOPMENT-OSX-NATIVE.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/docs/DEVELOPMENT-OSX-NATIVE.md b/docs/DEVELOPMENT-OSX-NATIVE.md index 44f161fe9e2..f08a1310971 100644 --- a/docs/DEVELOPMENT-OSX-NATIVE.md +++ b/docs/DEVELOPMENT-OSX-NATIVE.md @@ -190,11 +190,9 @@ Download from https://www.google.com/chrome/index.html ## ImageMagick -ImageMagick is used for generating avatars (including for test fixtures). Brew installs ImageMagick 7 by default, and this version -doesn't work with Discourse. +ImageMagick is used for generating avatars (including for test fixtures). - brew install imagemagick@6 - brew link --force imagemagick@6 + brew install imagemagick ImageMagick is going to want to use the Helvetica font to generate the letter-avatars: From 5affdcbd590ce3d6307fec0025d5baf789a166f3 Mon Sep 17 00:00:00 2001 From: Godfrey Chan Date: Wed, 25 Jul 2018 14:34:03 -0700 Subject: [PATCH 2/2] Bump Ruby version in some docs --- .ruby-version.sample | 2 +- README.md | 2 +- docs/DEVELOPMENT-OSX-NATIVE.md | 8 ++++---- script/osx_dev | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.ruby-version.sample b/.ruby-version.sample index 005119baaa0..79a614418f7 100644 --- a/.ruby-version.sample +++ b/.ruby-version.sample @@ -1 +1 @@ -2.4.1 +2.4.4 diff --git a/README.md b/README.md index 6e04e399e9d..a34a9619b1a 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Browse [lots more notable Discourse instances](https://www.discourse.org/custome 2. If you're familiar with how Rails works and are comfortable setting up your own environment, use our [**Discourse Advanced Developer Guide**](docs/DEVELOPER-ADVANCED.md). -Before you get started, ensure you have the following minimum versions: [Ruby 2.3+](http://www.ruby-lang.org/en/downloads/), [PostgreSQL 9.3+](http://www.postgresql.org/download/), [Redis 2.6+](http://redis.io/download). If you're having trouble, please see our [**TROUBLESHOOTING GUIDE**](docs/TROUBLESHOOTING.md) first! +Before you get started, ensure you have the following minimum versions: [Ruby 2.4+](http://www.ruby-lang.org/en/downloads/), [PostgreSQL 9.3+](http://www.postgresql.org/download/), [Redis 2.6+](http://redis.io/download). If you're having trouble, please see our [**TROUBLESHOOTING GUIDE**](docs/TROUBLESHOOTING.md) first! ## Setting up Discourse diff --git a/docs/DEVELOPMENT-OSX-NATIVE.md b/docs/DEVELOPMENT-OSX-NATIVE.md index f08a1310971..a162b70d6e0 100644 --- a/docs/DEVELOPMENT-OSX-NATIVE.md +++ b/docs/DEVELOPMENT-OSX-NATIVE.md @@ -4,7 +4,7 @@ These instructions assume you have read and understood the **[Discourse Advanced OS X has become a popular platform for developing Ruby on Rails applications; as such, if you run OS X, you might find it more congenial to work on **[Discourse](http://discourse.org)** in your native environment. These instructions should get you there. -Obviously, if you **already** develop Ruby on OS X, a lot of this will be redundant, because you'll have already done it, or something like it. If that's the case, you may well be able to just install Ruby 2.3 using RVM and get started! Discourse has enough dependencies, however (note: not a criticism!) that there's a good chance you'll find **something** else in this document that's useful for getting your Discourse development started! +Obviously, if you **already** develop Ruby on OS X, a lot of this will be redundant, because you'll have already done it, or something like it. If that's the case, you may well be able to just install Ruby 2.4+ using RVM and get started! Discourse has enough dependencies, however (note: not a criticism!) that there's a good chance you'll find **something** else in this document that's useful for getting your Discourse development started! ## Quick Setup @@ -76,11 +76,11 @@ If you do already have RVM installed, this should make sure everything is up to # If autolibs is set to 0-2, it will give an error for things that are missing, instead. rvm requirements -Either way, you'll now want to install the 'turbo' version of Ruby 2.0. +Either way, you'll now want to install Ruby 2.4+ (we recommend 2.4.4 or higher). # Now, install Ruby - rvm install 2.3.4-turbo - rvm use 2.3.4 --default # Careful with this if you're already developing Ruby + rvm install 2.4.4 + rvm use 2.4.4 --default # Careful with this if you're already developing Ruby ## Git diff --git a/script/osx_dev b/script/osx_dev index d1210768385..a03ac0c7afe 100755 --- a/script/osx_dev +++ b/script/osx_dev @@ -40,12 +40,12 @@ source ~/.rvm/scripts/rvm rvm get stable rvm autolibs homebrew # Tell RVM to install anything it's missing with homebrew rvm requirements # This will install baseline requirements that might be missing -rvm install 2.0.0-turbo # Now, install Ruby 2.0.0 with performance patches -rvm --create --ruby-version use 2.0.0-turbo # Use this Ruby as the default in this directory +rvm install 2.4.4 # Now, install Ruby 2.4.4 +rvm --create --ruby-version use 2.4.4 # Use this Ruby as the default in this directory # Check that the correct version is installed and active echo "Checking Ruby installation..." -ruby -v | grep 2.0.0 +ruby -v | grep 2.4.4 ## Configure PostgreSQL (PostgreSQL was installed by Homebrew using `brew bundle`) ## echo "Loading PostgreSQL..."