consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3627 from consul/upgrade_to_ruby2.4

Browse Source 
Upgrade ruby to 2.4.6
This commit is contained in:
Javier Martín
2019-10-13 01:00:00 +02:00
committed by GitHub
parent b30aaed13e a8331c956f
commit 970c3238fb
6 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.rubocop_basic.yml
View File

@@ -9,7 +9,6 @@ AllCops:
Exclude: Exclude:
- "db/migrate/**/*" - "db/migrate/**/*"
- "db/schema.rb" - "db/schema.rb"
TargetRubyVersion: 2.3
# RuboCop has a bunch of cops enabled by default. This setting tells RuboCop # RuboCop has a bunch of cops enabled by default. This setting tells RuboCop
# to ignore them, so only the ones explicitly set in this file are enabled. # to ignore them, so only the ones explicitly set in this file are enabled.
DisabledByDefault: true DisabledByDefault: true

2
.ruby-version
View File

@@ -1 +1 @@
2.3.2 2.4.6

2
.travis.yml
View File

@@ -2,8 +2,6 @@ language: ruby
addons: addons:
postgresql: "9.4" postgresql: "9.4"
chrome: stable chrome: stable
rvm:
- 2.3.2
cache: bundler cache: bundler
bundler_args: --without development bundler_args: --without development
before_script: before_script:

2
README.md
View File

@@ -37,7 +37,7 @@ You can access the main website of the project at [http://consulproject.org](htt
**NOTE**: For more detailed instructions check the [docs](https://docs.consulproject.org) **NOTE**: For more detailed instructions check the [docs](https://docs.consulproject.org)
Prerequisites: install git, Ruby 2.3.2, `bundler` gem, Node.js and PostgreSQL (>=9.4). Prerequisites: install git, Ruby 2.4.6, `bundler` gem, Node.js and PostgreSQL (>=9.4).
```bash ```bash
git clone https://github.com/consul/consul.git git clone https://github.com/consul/consul.git

2
README_ES.md
View File

@@ -36,7 +36,7 @@ Puedes acceder a la página principal del proyecto en [http://consulproject.org]
**NOTA**: para unas instrucciones más detalladas consulta la [documentación](https://docs.consulproject.org) **NOTA**: para unas instrucciones más detalladas consulta la [documentación](https://docs.consulproject.org)
Prerequisitos: tener instalado git, Ruby 2.3.2, la gema `bundler`, Node.js y PostgreSQL (9.4 o superior). Prerequisitos: tener instalado git, Ruby 2.4.6, la gema `bundler`, Node.js y PostgreSQL (9.4 o superior).
```bash ```bash
git clone https://github.com/consul/consul.git git clone https://github.com/consul/consul.git

11
config/deploy.rb
View File

@@ -7,7 +7,6 @@ def deploysecret(key)
end end
set :rails_env, fetch(:stage) set :rails_env, fetch(:stage)
set :rvm1_ruby_version, "2.3.2"
set :rvm1_map_bins, -> { fetch(:rvm_map_bins).to_a.concat(%w[rake gem bundle ruby]).uniq } set :rvm1_map_bins, -> { fetch(:rvm_map_bins).to_a.concat(%w[rake gem bundle ruby]).uniq }
set :application, "consul" set :application, "consul"
@@ -41,9 +40,9 @@ set(:config_files, %w[
set :whenever_roles, -> { :app } set :whenever_roles, -> { :app }
namespace :deploy do namespace :deploy do
#before :starting, "rvm1:install:rvm" # install/update RVM before :starting, "rvm1:install:rvm"
#before :starting, "rvm1:install:ruby" # install Ruby and create gemset before :starting, "rvm1:install:ruby"
#before :starting, "install_bundler_gem" # install bundler gem before :starting, "install_bundler_gem"
after "deploy:migrate", "add_new_settings" after "deploy:migrate", "add_new_settings"
after :publishing, "deploy:restart" after :publishing, "deploy:restart"
@@ -63,7 +62,9 @@ end
task :install_bundler_gem do task :install_bundler_gem do
on roles(:app) do on roles(:app) do
execute "rvm use #{fetch(:rvm1_ruby_version)}; gem install bundler" within release_path do
execute :rvm, fetch(:rvm1_ruby_version), "do", "gem install bundler"
end
end end
end end