diff --git a/Capfile b/Capfile index 1bc4bd23..5876b1fe 100644 --- a/Capfile +++ b/Capfile @@ -10,8 +10,7 @@ require "capistrano/scm/git" install_plugin Capistrano::SCM::Git require "capistrano/rails" -require "capistrano/rbenv" -# require 'capistrano/rvm' +require "capistrano/asdf" # Loads custom tasks from `lib/capistrano/tasks' if you have any defined. Dir.glob("lib/capistrano/tasks/*.cap").each { |r| import r } diff --git a/Gemfile b/Gemfile index 4bb8c163..1b06ae71 100644 --- a/Gemfile +++ b/Gemfile @@ -103,10 +103,9 @@ group :development do # Deployment gem "capistrano" + gem "capistrano-asdf" gem "capistrano-passenger" gem "capistrano-rails" - gem "capistrano-rbenv" - gem "capistrano-rvm" # Linting gem "rubocop", "~> 1.30" diff --git a/Gemfile.lock b/Gemfile.lock index e14b761c..c694d856 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -84,6 +84,9 @@ GEM i18n rake (>= 10.0.0) sshkit (>= 1.9.0) + capistrano-asdf (1.1.1) + capistrano (~> 3.0) + sshkit (~> 1.2) capistrano-bundler (2.0.1) capistrano (~> 3.1) capistrano-passenger (0.2.1) @@ -91,12 +94,6 @@ GEM capistrano-rails (1.6.2) capistrano (~> 3.1) capistrano-bundler (>= 1.1, < 3) - capistrano-rbenv (2.2.0) - capistrano (~> 3.1) - sshkit (~> 1.3) - capistrano-rvm (0.1.2) - capistrano (~> 3.0) - sshkit (~> 1.2) chartkick (4.1.3) chunky_png (1.4.0) climate_control (0.2.0) @@ -393,10 +390,9 @@ DEPENDENCIES byebug cancancan (~> 3.3) capistrano + capistrano-asdf capistrano-passenger capistrano-rails - capistrano-rbenv - capistrano-rvm chartkick (~> 4.0) daemons (~> 1.4) delayed_job (~> 4.1) diff --git a/config/deploy/production.rb b/config/deploy/production.rb index ca82c463..681ea3ca 100644 --- a/config/deploy/production.rb +++ b/config/deploy/production.rb @@ -5,10 +5,3 @@ } set :rails_env, 'production' -set :rbenv_type, :system -set :rbenv_ruby, File.read('.ruby-version').strip - -# NVM config -set :default_env, { - path: "/home/tap/.nvm/versions/node/v14.18.0/bin:$PATH" -}