Skip to content

Commit

Permalink
Merge pull request #425 from dylan8902/feature/upgrade-ruby-3-3-6
Browse files Browse the repository at this point in the history
Upgrade to ruby 3.3.6
  • Loading branch information
dylan8902 authored Dec 8, 2024
2 parents 80c371d + 26c928a commit 99e818d
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.3.0'
ruby-version: '3.3.6'
bundler-cache: true
- name: Run security tests
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.3.0'
ruby-version: '3.3.6'
bundler-cache: true
- name: Create database
run: |
Expand Down
14 changes: 7 additions & 7 deletions BUILD.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

- Set up database
``` bash
brew install mysql
brew services start mysql
brew install mysql@8.4
brew services start mysql@8.4
```

- Setup Ruby and Rails

``` bash
rvm install ruby-3.3.0 --reconfigure --enable-yjit --with-openssl-dir=$(brew --prefix openssl@1.1)
rvm use 3.3.0 --default
rvm install ruby-3.3.6 --reconfigure --enable-yjit --with-openssl-dir=$(brew --prefix openssl)
rvm use 3.3.6 --default
bundle install
```

Expand Down Expand Up @@ -60,8 +60,8 @@ ssh-keygen -t rsa -C "your_email@example.com"
rm -rf /home/rails
git clone git@github.com:dylan8902/website.git /home/rails
cd /home/rails
rvm install 3.3.0
rvm use 3.3.0 --default
rvm install 3.3.6
rvm use 3.3.6 --default
bundle install
```

Expand Down Expand Up @@ -122,9 +122,9 @@ service nginx restart
## Update Let's Encrypt SSL

``` bash
certbot certonly --text --agree-tos --email dyl@anjon.es -d dyl.anjon.es -d ismytraindelayed.com -d isitaproxyproblem.com -d dylanjones.info --manual --preferred-challenges dns --expand --renew-by-default --manual-public-ip-logging-ok
rm dyl.anjon.es.key.old
rm dyl.anjon.es.crt.old
certbot --text --agree-tos --email dyl@anjon.es -d dyl.anjon.es -d ismytraindelayed.com -d isitaproxyproblem.com --manual --preferred-challenges dns --expand --renew-by-default --manual-public-ip-logging-ok certonly
cp dyl.anjon.es.crt dyl.anjon.es.crt.old
cp dyl.anjon.es.key dyl.anjon.es.key.old
cp /etc/letsencrypt/live/dyl.anjon.es/fullchain.pem dyl.anjon.es.crt
Expand Down
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
source 'https://rubygems.org'

ruby '3.3.0'
ruby '3.3.6'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '>= 7.0.1', '< 7.1'
# Use sqlite3 as the database for Active Record
gem 'sqlite3'
gem 'sqlite3', '~> 1.4'
# Use Puma as the app server
gem 'puma'
# Use Uglifier as compressor for JavaScript assets
Expand Down
2 changes: 1 addition & 1 deletion config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
module Testy
class Application < Rails::Application
# Initialize configuration defaults for originally generated Rails version.
config.load_defaults 5.0
config.load_defaults 6.1

# Configuration for the application, engines, and railties goes here.
#
Expand Down
8 changes: 4 additions & 4 deletions config/server/unicorn
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ CONFIG_RB=/home/unicorn/unicorn.conf
PID=/home/unicorn/pids/unicorn.pid
UNICORN_OPTS="-D -c $CONFIG_RB -E production"

PATH=/usr/local/rvm/rubies/ruby-3.3.0/bin:/usr/local/rvm/gems/ruby-3.3.0/bin:/home/unicorn/.rvm/bin:/usr/local/sbin:/usr/bin:/bin:/sbin:$
export GEM_HOME=/usr/local/rvm/gems/ruby-3.3.0
export GEM_PATH=/usr/local/rvm/gems/ruby-3.3.0:/usr/local/rvm/gems/ruby-3.3.0:/usr/local/rvm/rubies/ruby-3.3.0/lib/ruby/gems/3.3.0
DAEMON=/usr/local/rvm/gems/ruby-3.3.0/bin/unicorn
PATH=/usr/local/rvm/rubies/ruby-3.3.6/bin:/usr/local/rvm/gems/ruby-3.3.6/bin:/home/unicorn/.rvm/bin:/usr/local/sbin:/usr/bin:/bin:/sbin:$
export GEM_HOME=/usr/local/rvm/gems/ruby-3.3.6
export GEM_PATH=/usr/local/rvm/gems/ruby-3.3.6:/usr/local/rvm/gems/ruby-3.3.6:/usr/local/rvm/rubies/ruby-3.3.6/lib/ruby/gems/3.3.6
DAEMON=/usr/local/rvm/gems/ruby-3.3.6/bin/unicorn

0 comments on commit 99e818d

Please sign in to comment.