diff options
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 6 | ||||
| -rw-r--r-- | config/deploy.rb | 8 | ||||
| -rw-r--r-- | lib/tasks/ci.rake | 5 |
4 files changed, 14 insertions, 8 deletions
@@ -1,3 +1,4 @@ +# coding: utf-8 source 'https://rubygems.org' # Use https for github @@ -15,7 +16,7 @@ gem 'uglifier', '~> 2.7.2' gem 'coffee-rails', '~> 4.0.0' # Webpacker -gem 'webpacker', '~> 3.0' +gem 'webpacker', '3.0.2' # Use jquery as the JavaScript library gem 'jquery-rails', '~> 3.1.4' # Update to v4 for Rails 4.2 diff --git a/Gemfile.lock b/Gemfile.lock index ba86a911f..3a2314857 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -562,7 +562,7 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff - webpacker (3.2.1) + webpacker (3.0.2) activesupport (>= 4.2) rack-proxy (>= 0.6.1) railties (>= 4.2) @@ -698,10 +698,10 @@ DEPENDENCIES transpec uglifier (~> 2.7.2) webmock - webpacker (~> 3.0) + webpacker (= 3.0.2) whenever! will_paginate will_paginate-bootstrap BUNDLED WITH - 1.16.0 + 1.16.1 diff --git a/config/deploy.rb b/config/deploy.rb index d541f2581..9be023adc 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -7,10 +7,14 @@ set :scm, :git set :repository, "git@github.com:AF83/stif-boiv.git" set :deploy_to, "/var/www/stif-boiv" set :use_sudo, false +set :ruby_version, "2.3.0" default_run_options[:pty] = true set :group_writable, true -set :bundle_cmd, "/var/lib/gems/2.3.0/bin/bundle" +set :bundle_cmd, "/var/lib/gems/#{ruby_version}/bin/bundle" set :rake, "#{bundle_cmd} exec rake" +set :default_environment, { + 'PATH' => "/var/lib/gems/#{ruby_version}/bin:$PATH" +} set :keep_releases, -> { fetch(:kept_releases, 5) } after "deploy:restart", "deploy:cleanup" @@ -29,7 +33,7 @@ require 'whenever/capistrano' #after 'deploy:finalize_update', 'npm:install' # Whenever -set :whenever_variables, ->{ "'environment=#{fetch :whenever_environment}&bundle_command=bin/bundle exec&additionnal_path=/var/lib/gems/2.3.0/bin'" } # invoke bin/bundle to use 'correct' ruby environment +set :whenever_variables, ->{ "'environment=#{fetch :whenever_environment}&bundle_command=bin/bundle exec&additionnal_path=/var/lib/gems/#{ruby_version}/bin'" } # invoke bin/bundle to use 'correct' ruby environment set :whenever_command, "sudo /usr/local/sbin/whenever-sudo" # use sudo to change www-data crontab set :whenever_user, "www-data" # use www-data crontab diff --git a/lib/tasks/ci.rake b/lib/tasks/ci.rake index 3e73b7a3b..13d7b8d73 100644 --- a/lib/tasks/ci.rake +++ b/lib/tasks/ci.rake @@ -3,7 +3,7 @@ namespace :ci do task :setup do cp "config/database/jenkins.yml", "config/database.yml" sh "RAILS_ENV=test rake db:drop db:create db:migrate" - sh "yarn --production --no-progress install" + sh "yarn --no-progress install" end def git_branch @@ -38,7 +38,8 @@ namespace :ci do end task :jest => "ci:assets" do - sh "node_modules/.bin/jest" + sh "yarn --no-progress install" # Hack to force install jest after webpack + sh "node_modules/.bin/jest" unless ["CHOUETTE_JEST_DISABLED"] end desc "Deploy after CI" |