From 6ec587ce5307b25b95ef37463b1ae547cbfeb7ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lecour?= Date: Tue, 12 Jun 2018 23:00:09 +0200 Subject: [PATCH 1/4] Change Ruby version in Gemfile and .ruby-version --- .ruby-version | 2 +- Gemfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ruby-version b/.ruby-version index 4fd0fe3..0bee604 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.5.1 \ No newline at end of file +2.3.3 diff --git a/Gemfile b/Gemfile index 14530c2..3f5c9d2 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby '2.5.1' +ruby '2.3.3' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 5.2.0' From 97076f92c136e5bb67617f2d237d758f5000ec2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lecour?= Date: Tue, 12 Jun 2018 23:07:39 +0200 Subject: [PATCH 2/4] Update Gemfile.lock with Ruby 2.3.3 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 146651b..5ed0b75 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -387,7 +387,7 @@ DEPENDENCIES whenever RUBY VERSION - ruby 2.5.1p57 + ruby 2.3.3p222 BUNDLED WITH 1.16.2 From 276ba38d95900392f7ac62f8d1a3dc3d2f395fd2 Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Wed, 8 Aug 2018 10:17:53 +0200 Subject: [PATCH 3/4] Adjust dependencies and documentation for Ruby requirements --- .gitignore | 3 +++ Gemfile | 2 +- INSTALL.md | 8 +++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index eecf914..0bfdc6a 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,9 @@ # Ignore bundler config. /.bundle +# Ruby version +.ruby-version + # Ignore all logfiles and tempfiles. /log/* /tmp/* diff --git a/Gemfile b/Gemfile index 3f5c9d2..3a1e905 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby '2.3.3' +ruby '>= 2.3.3' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 5.2.0' diff --git a/INSTALL.md b/INSTALL.md index afe5a26..0f81678 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -3,7 +3,7 @@ ## Requirements Chexpire requires : -* Ruby 2.5.1 and Bundler +* Ruby > 2.3.3 and Bundler * NodeJS and Yarn * MySQL or MariaDB @@ -13,6 +13,8 @@ We are usually running Chexpire on typical POSIX servers like : It probably works on any system that supports Ruby >2.3, NodeJS >6 and MySQL >5.5. Feel free to report any unexpected incompatibilities. +If you use rbenv, chruby or RVM, you can set your prefered Ruby version in the `.ruby-version` file at the root of the project. + If you are familiar with Ansible, you can use our [Ansible roles](http://forge.evolix.org/projects/ansible-roles) to easily install the requirements : rbenv, mysql, nodejs. Add this to your playbook : ``` @@ -24,9 +26,9 @@ roles: […] ``` -> NB: the Rbenv `username` variable points to the user that you want to install Rbenv for. If you use this user for the SSH connection of Ansible, you can leave the `{{ ansible_user }}` value. +> NB: the rbenv `username` variable points to the user that you want to install rbenv for. If you use this user for the SSH connection of Ansible, you can leave the `{{ ansible_user }}` value. -If you want to do manual installations, you can use our Wiki documentations for [Rbenv](https://github.com/rbenv/rbenv/#installation), [NodeJS](https://wiki.evolix.org/HowtoNodeJS#installation), [Yarn](https://wiki.evolix.org/HowtoNodeJS#yarn) and [MariaDB](https://wiki.evolix.org/HowtoMySQL#installation). +If you want to do manual installations, you can use our Wiki documentations for [rbenv](https://github.com/rbenv/rbenv/#installation), [NodeJS](https://wiki.evolix.org/HowtoNodeJS#installation), [Yarn](https://wiki.evolix.org/HowtoNodeJS#yarn) and [MariaDB](https://wiki.evolix.org/HowtoMySQL#installation). ## Dependencies From 3290c6a9d26718557c83902a866ccf1371077bd6 Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Wed, 8 Aug 2018 11:49:41 +0200 Subject: [PATCH 4/4] Don't force the Ruby version by default --- .ruby-version | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .ruby-version diff --git a/.ruby-version b/.ruby-version deleted file mode 100644 index 0bee604..0000000 --- a/.ruby-version +++ /dev/null @@ -1 +0,0 @@ -2.3.3