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.2, Ruby 3.3, Alpine 3.20 #5976

Merged
merged 12 commits into from
Jan 16, 2025
Merged
Next Next commit
bump ruby to 3.3 and alpine to 3.20
Ithanil committed Dec 12, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 0cbb2afe5ae1c9f61478f14543dc597a1c73d3f7
2 changes: 1 addition & 1 deletion .github/workflows/ci.build.prerelease.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
env:
RUBY_VERSION: 3.1
RUBY_VERSION: 3.3

name: CI Build Pre-Release
on:
2 changes: 1 addition & 1 deletion .github/workflows/ci.build.push.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
env:
RUBY_VERSION: 3.1
RUBY_VERSION: 3.3

name: CI Build Push
on:
4 changes: 2 additions & 2 deletions .github/workflows/ci.build.release.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
env:
RUBY_VERSION: 3.1
RUBY_VERSION: 3.3

name: CI Build Release
on:
@@ -13,7 +13,7 @@ jobs:
DOCKER_REPOSITORY: ${{ secrets.DOCKER_REPOSITORY }}
DOCKER_BUILD_ENABLED: ${{ secrets.DOCKER_BUILD_ENABLED }}
DOCKER_BUILD_ALTERNATE_ENABLED: ${{ secrets.DOCKER_BUILD_ALTERNATE_ENABLED }}
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
steps:
- name: Checkout
if: contains(env.DOCKER_BUILD_ENABLED, 'true')
4 changes: 2 additions & 2 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
DATABASE_URL: postgres://postgres:postgres@localhost/greenlight-actions
RAILS_ENV: test

@@ -11,7 +11,7 @@ on:
jobs:
test:
name: Rubocop + RSpec + ESLint + License Header Check
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04

services:
postgres:
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ AllCops:
- 'vendor/bundle/**/*'
- 'config/routes.rb'
DisabledByDefault: false
TargetRubyVersion: 3.1
TargetRubyVersion: 3.3
NewCops: enable

# Document classes and non-namespace modules.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:alpine3.17 AS base
FROM ruby:alpine3.20 AS base

ARG RAILS_ROOT=/usr/src/app
ENV RAILS_ROOT=${RAILS_ROOT}
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '>= 3.0'
ruby '>= 3.3'

gem 'active_model_serializers', '>= 0.10.14'
gem 'active_storage_validations', '>= 1.1.0'
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ version: '3'

services:
postgres:
image: postgres:14.6-alpine3.17
image: postgres:14-alpine3.20
container_name: postgres
restart: unless-stopped
volumes:
@@ -12,7 +12,7 @@ services:
- POSTGRES_PASSWORD=

redis:
image: redis:6.2-alpine3.17
image: redis:6.2-alpine3.20
container_name: redis
restart: unless-stopped
volumes:
2 changes: 1 addition & 1 deletion dockerfiles/v3/alpine
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

ARG RAILS_ROOT=/usr/src/app
ENV RAILS_ROOT=${RAILS_ROOT}