Skip to content

Commit

Permalink
Merge pull request #376 from blackcandy-org/ruby-3-3
Browse files Browse the repository at this point in the history
Upgrade Ruby to 3.3
  • Loading branch information
aidewoode committed May 8, 2024
2 parents 0ffa79c + 73e5454 commit d35775f
Show file tree
Hide file tree
Showing 7 changed files with 120 additions and 116 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2
ruby-version: 3.3
bundler-cache: true
- uses: actions/setup-node@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2
ruby-version: 3.3
bundler-cache: true
- name: Deploy to demo
run: bundle exec kamal deploy -P --version=edge
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.2.2
3.3.1
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM node:20.11.0-alpine AS node
FROM ruby:3.2.2-alpine AS base
FROM ruby:3.3.1-alpine AS base
FROM base AS builder

ENV RAILS_ENV production
Expand Down
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ gem "pagy", "~> 6.0.0"
gem "image_processing", "~> 1.12"

# For API request
gem "httparty", "~> 0.21.0"
gem "httparty", "~> 0.22.0"

# For browser detection
gem "browser", "~> 5.3.1"
Expand Down Expand Up @@ -96,7 +96,7 @@ group :development do
end

group :test do
gem "capybara", "~> 3.39.0"
gem "capybara", "~> 3.40.0"
gem "cuprite", "~> 0.14.3"
gem "webmock", "~> 3.18.0", require: false
gem "simplecov", "~> 0.22.0", require: false
Expand Down
Loading

0 comments on commit d35775f

Please sign in to comment.