Finish migrating to Ruby 3.3.0

As the comment in `deploy.yml` explains, this was a multi-step process,
but it went very smoothly as planned, hooray!!

I noticed again while making this change that Bundler doesn't seem to
be availing itself of the checked-in dependencies in `vendor/cache`. I
think I know the fix for this, I'll toss it into an upcoming change and
see if it works!
This commit is contained in:
Emi Matchu 2024-02-22 12:05:02 -08:00
parent b18dd115a1
commit 472ae645a0
5 changed files with 28 additions and 10 deletions

View File

@ -1 +1 @@
3.1.4 3.3.0

View File

@ -1,5 +1,5 @@
source 'https://rubygems.org' source 'https://rubygems.org'
ruby '3.1.4' ruby '3.3.0'
gem 'rails', '~> 7.1', '>= 7.1.3.2' gem 'rails', '~> 7.1', '>= 7.1.3.2'

View File

@ -394,7 +394,7 @@ DEPENDENCIES
will_paginate (~> 4.0) will_paginate (~> 4.0)
RUBY VERSION RUBY VERSION
ruby 3.1.4p223 ruby 3.3.0p0
BUNDLED WITH BUNDLED WITH
2.3.26 2.5.5

View File

@ -9,6 +9,19 @@
# deploy:setup should have added us to the "impress-deployers" group, so we # deploy:setup should have added us to the "impress-deployers" group, so we
# should be able to become the "impress" user without a password. # should be able to become the "impress" user without a password.
ansible_become_password: "" ansible_become_password: ""
# Set this to `yes` to skip setting this version as `current`. (We also
# skip our usual cleanup, to avoid disrupting the `current` version!)
#
# This can be useful for upgrading our Ruby version without downtime:
# 1. Install the new Ruby version, but don't uninstall the old one.
# 2. Update the app to reference the new Ruby version in the `Gemfile`.
# 3. Deploy the app with `skip_set_as_current`.
# 4. Update the service file manually to use the new Ruby to run the new
# version of the app, referenced directly by path.
# 5. Link the new version as `current` manually.
# 6. Reset the service file to use the new Ruby to run `current`.
skip_set_as_current: no
tasks: tasks:
- name: Generate a version name from the current timestamp - name: Generate a version name from the current timestamp
command: date '+%Y-%m-%d-%s' command: date '+%Y-%m-%d-%s'
@ -41,7 +54,7 @@
- name: Configure Bundler to run in deployment mode - name: Configure Bundler to run in deployment mode
command: command:
chdir: "{{ remote_app_root }}" chdir: "{{ remote_app_root }}"
cmd: /opt/ruby-3.1.4/bin/bundle config set --local deployment true cmd: /opt/ruby-3.3.0/bin/bundle config set --local deployment true
# This ensures that, while attempting our current deploy, we don't # This ensures that, while attempting our current deploy, we don't
# accidentally delete gems out from under the currently-running version. # accidentally delete gems out from under the currently-running version.
@ -51,7 +64,7 @@
- name: Configure Bundler to *not* clean up old gems when installing - name: Configure Bundler to *not* clean up old gems when installing
command: command:
chdir: "{{ remote_app_root }}" chdir: "{{ remote_app_root }}"
cmd: /opt/ruby-3.1.4/bin/bundle config set --local clean false cmd: /opt/ruby-3.3.0/bin/bundle config set --local clean false
# NOTE: Bundler recommends this, and they're pretty smart about it: if the # NOTE: Bundler recommends this, and they're pretty smart about it: if the
# Gemfile changes, this shouldn't disrupt the currently-running version, # Gemfile changes, this shouldn't disrupt the currently-running version,
@ -60,18 +73,19 @@
- name: Configure Bundler to use the bundle folder shared by all app versions - name: Configure Bundler to use the bundle folder shared by all app versions
command: command:
chdir: "{{ remote_app_root }}" chdir: "{{ remote_app_root }}"
cmd: "/opt/ruby-3.1.4/bin/bundle config set --local path {{ remote_project_root}}/shared/bundle" cmd: "/opt/ruby-3.3.0/bin/bundle config set --local path {{ remote_project_root}}/shared/bundle"
- name: Run `bundle install` to install dependencies in remote folder - name: Run `bundle install` to install dependencies in remote folder
command: command:
chdir: "{{ remote_app_root }}" chdir: "{{ remote_app_root }}"
cmd: /opt/ruby-3.1.4/bin/bundle install cmd: /opt/ruby-3.3.0/bin/bundle install
- name: Update the `current` folder to point to the new version - name: Update the `current` folder to point to the new version
file: file:
src: "{{ remote_app_root }}" src: "{{ remote_app_root }}"
dest: /srv/impress/current dest: /srv/impress/current
state: link state: link
when: not skip_set_as_current
# NOTE: This uses the passwordless sudo rule we set up in deploy:setup. # NOTE: This uses the passwordless sudo rule we set up in deploy:setup.
# We write it as a command rather than using the built-in `systemd` Ansible # We write it as a command rather than using the built-in `systemd` Ansible
@ -83,11 +97,13 @@
- name: Restart the app - name: Restart the app
become: no become: no
command: sudo systemctl restart impress command: sudo systemctl restart impress
when: not skip_set_as_current
- name: Clean up gems no longer used in the current app version - name: Clean up gems no longer used in the current app version
command: command:
chdir: "{{ remote_app_root }}" chdir: "{{ remote_app_root }}"
cmd: /opt/ruby-3.1.4/bin/bundle clean cmd: /opt/ruby-3.3.0/bin/bundle clean
when: not skip_set_as_current
- name: Find older app versions to clean up - name: Find older app versions to clean up
# Print out all but the 5 last-recently-updated versions. # Print out all but the 5 last-recently-updated versions.
@ -95,9 +111,11 @@
chdir: "{{ remote_project_root }}/versions" chdir: "{{ remote_project_root }}/versions"
cmd: bash -c 'ls -t | tail -n +6' cmd: bash -c 'ls -t | tail -n +6'
register: versions_to_clean_up register: versions_to_clean_up
when: not skip_set_as_current
- name: Clean up older versions - name: Clean up older versions
file: file:
path: "{{ remote_project_root }}/versions/{{ item }}" path: "{{ remote_project_root }}/versions/{{ item }}"
state: absent state: absent
with_items: "{{ versions_to_clean_up.stdout_lines }}" with_items: "{{ versions_to_clean_up.stdout_lines }}"
when: not skip_set_as_current

View File

@ -5,7 +5,7 @@ Description=Dress to Impress webapp
User=impress User=impress
Restart=always Restart=always
WorkingDirectory=/srv/impress/current WorkingDirectory=/srv/impress/current
ExecStart=/opt/ruby-3.1.4/bin/bundle exec falcon host ExecStart=/opt/ruby-3.3.0/bin/bundle exec falcon host
Environment="RAILS_ENV=production" Environment="RAILS_ENV=production"
; Set EXECJS_RUNTIME to save us from needing to install Node ; Set EXECJS_RUNTIME to save us from needing to install Node
Environment="EXECJS_RUNTIME=Disabled" Environment="EXECJS_RUNTIME=Disabled"