Skip to content

Commit

Permalink
chore: downgrade ruby to version with pre-builded binary
Browse files Browse the repository at this point in the history
  • Loading branch information
loqimean committed Oct 8, 2024
1 parent ab5ecfc commit 3bff2f0
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 17 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
- uses: actions/checkout@v2
- uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2.5
ruby-version: 3.2.3
bundler-cache: true
cache-version: 1
- name: Run rubocop
Expand Down Expand Up @@ -48,7 +48,7 @@ jobs:
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2.5
ruby-version: 3.2.3
bundler-cache: true

- uses: actions/setup-node@v1
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-3.2.5
ruby-3.2.3
8 changes: 2 additions & 6 deletions Capfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,7 @@ require "capistrano/rails/migrations"
require "capistrano/passenger"
require "capistrano/rails_tail_log"
require "capistrano/rails"
require "capistrano/rbenv"
require "dotenv"

set :rbenv_type, :user

Dotenv.load
require "capistrano/rvm"
# require "capistrano/rbenv"

Dir.glob("lib/capistrano/tasks/*.rake").each { |r| import r }
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:3.2.5
FROM ruby:3.2.3

ENV BUNDLER_VERSION=2.2.8

Expand Down
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
source "https://rubygems.org"
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby "3.2.5"
ruby "3.2.3"

gem "mutex_m", "0.1.2"
gem "cancancan", "~> 3.3"
Expand Down Expand Up @@ -76,6 +76,7 @@ group :development do
gem "capistrano-rails", "~> 1.4"
gem "capistrano-passenger", "~> 0.2.0"
gem "capistrano-rbenv", "~> 2.1", ">= 2.1.4"
gem "capistrano-rvm"
gem "capistrano-yarn"
gem "capistrano-rails-tail-log"
gem "ed25519"
Expand Down
6 changes: 5 additions & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,9 @@ GEM
capistrano-rbenv (2.2.0)
capistrano (~> 3.1)
sshkit (~> 1.3)
capistrano-rvm (0.1.2)
capistrano (~> 3.0)
sshkit (~> 1.2)
capistrano-yarn (2.0.2)
capistrano (~> 3.0)
capybara (3.39.2)
Expand Down Expand Up @@ -607,6 +610,7 @@ DEPENDENCIES
capistrano-rails (~> 1.4)
capistrano-rails-tail-log
capistrano-rbenv (~> 2.1, >= 2.1.4)
capistrano-rvm
capistrano-yarn
capybara (>= 3.26)
codecov
Expand Down Expand Up @@ -672,7 +676,7 @@ DEPENDENCIES
webdrivers (~> 5.3.1)

RUBY VERSION
ruby 3.2.5p208
ruby 3.2.3p157

BUNDLED WITH
2.4.18
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ The latest version from the release branch 'master' is automatically deployed to

# Required to install

- Ruby 3.2.5
- Ruby 3.2.3
- Ruby on Rails 7.1.2
- PostgreSQL 12
- Puma as a web server
Expand Down
2 changes: 1 addition & 1 deletion config/deploy.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
# set :pty, true

# Default value for :linked_files is []
set :linked_files, fetch(:linked_files, []).push(".env", "config/database.yml")
set :linked_files, fetch(:linked_files, []).push("config/database.yml")

# Default value for linked_dirs is []
set :linked_dirs, fetch(:linked_dirs, []).push("log", "tmp/pids", "tmp/cache", "tmp/sockets", "vendor/bundle", "public/system", "public/uploads", "storage")
Expand Down
1 change: 1 addition & 0 deletions config/deploy/production.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
require "capistrano/yarn"

set :user, "deploy"
set :rbenv_type, :user

server "185.233.37.137", user: fetch(:user), roles: ["app", "db", "web"], primary: true, port: 22

Expand Down
7 changes: 4 additions & 3 deletions config/deploy/staging.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
set :user, "bitnami"
set :user, "ubuntu"

server "3.120.151.175", user: fetch(:user), roles: ["app", "db", "web"], primary: true, port: 22
server "51.44.25.104", user: fetch(:user), roles: ["app", "db", "web"], primary: true, port: 22

set :passenger_restart_with_touch, true
set :deploy_to, "/home/#{fetch(:user)}/#{fetch(:application)}"
Expand All @@ -14,4 +14,5 @@
set :rails_env, "staging"

set :branch, :develop
set :rbenv_ruby, "3.2.5"
set :rvm_ruby, "3.2.3"
set :rvm_custom_path, "/usr/share/rvm"

0 comments on commit 3bff2f0

Please sign in to comment.