Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to Rails 7.1 (+ Ruby 3.3 & Alpine 3.20) #1122

Merged
merged 15 commits into from
Nov 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
env:
RUBY_VERSION: 3.1.0
RUBY_VERSION: 3.3.6
DATABASE_URL: postgres://postgres:postgres@localhost:5432/postgres

name: CI
Expand All @@ -15,7 +15,7 @@ on:
jobs:
test:
name: Rubocop + Rails Test
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

services:
postgres:
Expand All @@ -36,7 +36,7 @@ jobs:
uses: actions/checkout@v3

- name: Install Ruby ${{ env.RUBY_VERSION }}
uses: ruby/setup-ruby@v1.126.0
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ env.RUBY_VERSION }}

Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.17 AS alpine
FROM alpine:3.20 AS alpine

FROM ubuntu:20.04 AS bbb-playback
ENV DEBIAN_FRONTEND=noninteractive
Expand Down Expand Up @@ -44,9 +44,9 @@ RUN apk add --no-cache \
tzdata \
shared-mime-info
# ruby-start.
# Install Ruby from sources since Scalelite does not use the version shipped with Apline.
ARG RUBY_RELEASE="https://cache.ruby-lang.org/pub/ruby/3.1/ruby-3.1.6.tar.gz"
ARG RUBY="ruby-3.1.6"
# Install Ruby from sources since Scalelite does not necessarily use the version shipped with Apline.
ARG RUBY_RELEASE="https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.6.tar.gz"
ARG RUBY="ruby-3.3.6"
RUN apk add --no-cache git make gcc g++ libc-dev pkgconfig \
libxml2-dev libxslt-dev postgresql-dev coreutils curl wget bash \
gnupg tar linux-headers bison readline-dev readline zlib-dev \
Expand Down
5 changes: 3 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
ruby '>= 3.0.0'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 6.1', '>= 6.1.7.8'
gem 'rails', '~> 7.1'
# Use Puma as the app server
gem 'puma', '~> 6.4'

Expand Down Expand Up @@ -54,12 +54,13 @@ end
group :development do
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
gem 'spring-watcher-listen', '~> 2.0.1'
gem 'spring-watcher-listen', '~> 2.1.0'
end

group :test do
gem 'faker'
gem 'fakeredis', '~> 0.8'
gem 'minitest'
gem 'minitest-stub_any_instance'
gem 'rails-controller-testing'
gem 'webmock'
Expand Down
Loading
Loading