Skip to content

Commit

Permalink
Merge pull request #144 from ncbo/use_dot_ruby-version
Browse files Browse the repository at this point in the history
Use dot ruby version
  • Loading branch information
alexskr authored Mar 25, 2024
2 parents b16cc06 + 8df864f commit b6e21a5
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 7 deletions.
1 change: 0 additions & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ jobs:
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7.8 # Not needed with a .ruby-version file
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
- name: get-deployment-config
uses: actions/checkout@v4
Expand Down
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,6 @@ test/data/ontology_files/repo/**/*

*.swp

.ruby-version

config/environments/console.rb

config/environments/stage.rb
Expand Down
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.7.8
2 changes: 1 addition & 1 deletion Capfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ install_plugin Capistrano::SCM::Git
# https://github.com/capistrano/rails
#
# require 'capistrano/rvm'
# require 'capistrano/rbenv'
require 'capistrano/rbenv'
# require 'capistrano/chruby'
require 'capistrano/bundler'
# require 'capistrano/rails/assets'
Expand Down
5 changes: 4 additions & 1 deletion config/deploy.rb
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,12 @@
set :linked_dirs, %w{log vendor/bundle tmp/pids tmp/sockets public/system}

# rbenv
# set :rbenv_type, :system #or :user
set :rbenv_type, :system
set :rbenv_ruby, File.read('.ruby-version').strip
# set :rbenv_ruby, '2.2.5'
# set :rbenv_roles, :all # default value
set :bundle_without, 'development:test'
set :bundle_config, { deployment: true }

# do not use sudo
set :use_sudo, false
Expand Down
2 changes: 1 addition & 1 deletion config/deploy/production.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# server in each group is considered to be the first
# unless any hosts have the primary property set.
# Don't declare `role :all`, it's a meta role
ole :app, %w{api1.prd.ontoportal.org api2.prd.ontoportal.org/}
pole :app, %w{api1.prd.ontoportal.org api2.prd.ontoportal.org/}

# Extended Server Syntax
# ======================
Expand Down
2 changes: 1 addition & 1 deletion config/deploy/staging.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# server in each group is considered to be the first
# unless any hosts have the primary property set.
# Don't declare `role :all`, it's a meta role
ole :app, %w{api1.stg.ontoportal.org api2.stg.ontoportal.org}
role :app, %w{api1.stg.ontoportal.org api2.stg.ontoportal.org}

# Extended Server Syntax
# ======================
Expand Down

0 comments on commit b6e21a5

Please sign in to comment.