Skip to content

armgit / maybe

Public Imported from GitHub
0

The personal finance app for everyone

Bump to Ruby 3.3.1 (#709)

Zach Gollwitzer4f508cd151b7
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index f7abc755..7e41a083 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,27 +1,5 @@
-# ARG RUBY_VERSION=3.3.0
-# FROM ruby:${RUBY_VERSION}-slim-bullseye
-
-# TODO - Uncomment the lines above when 3.3.1 is released.
-# This is a temporary fix for a bug found here (https://stackoverflow.com/questions/77725755/segmentation-fault-during-rails-assetsprecompile-on-apple-silicon-m3-with-rub)
-
-FROM debian:bullseye-slim as base
-
-# Install dependencies for building Ruby
-RUN apt-get update && apt-get install -y build-essential wget autoconf
-
-# Install ruby-install for installing Ruby
-RUN wget https://github.com/postmodern/ruby-install/releases/download/v0.9.3/ruby-install-0.9.3.tar.gz \
- && tar -xzvf ruby-install-0.9.3.tar.gz \
- && cd ruby-install-0.9.3/ \
- && make install
-
-# Install Ruby 3.3.0 with the https://github.com/ruby/ruby/pull/9371 patch
-RUN ruby-install -p https://github.com/ruby/ruby/pull/9371.diff ruby 3.3.0
-
-# Make the Ruby binary available on the PATH
-ENV PATH="/opt/rubies/ruby-3.3.0/bin:${PATH}"
-
-# End TODO
+ARG RUBY_VERSION=3.3.1
+FROM ruby:${RUBY_VERSION}-slim-bullseye
RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
&& apt-get -y install --no-install-recommends \
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ebb49a02..fbd496cf 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -71,12 +71,6 @@ jobs:
- 5432:5432
options: --health-cmd="pg_isready" --health-interval=10s --health-timeout=5s --health-retries=3
- # redis:
- # image: redis
- # ports:
- # - 6379:6379
- # options: --health-cmd "redis-cli ping" --health-interval 10s --health-timeout 5s --health-retries 5
-
steps:
- name: Install packages
run: sudo apt-get update && sudo apt-get install --no-install-recommends -y google-chrome-stable curl libvips postgresql-client libpq-dev
@@ -94,11 +88,10 @@ jobs:
env:
RAILS_ENV: test
DATABASE_URL: postgres://postgres:postgres@localhost:5432
- # REDIS_URL: redis://localhost:6379/0
run: |
bin/rails db:create
bin/rails db:schema:load
- bin/rails test:all
+ bin/rails test
bin/rails db:seed
- name: Keep screenshots from failed system tests
diff --git a/.ruby-version b/.ruby-version
index 15a27998..bea438e9 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.3.0
+3.3.1
diff --git a/Dockerfile b/Dockerfile
index 8bdcfd8b..a30153ba 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
# syntax = docker/dockerfile:1
# Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile
-ARG RUBY_VERSION=3.3.0
+ARG RUBY_VERSION=3.3.1
FROM registry.docker.com/library/ruby:$RUBY_VERSION-slim as base
# Rails app lives here
diff --git a/Gemfile.lock b/Gemfile.lock
index 59c45bfd..9386e4fa 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -7,7 +7,7 @@ GIT
GIT
remote: https://github.com/rails/rails.git
- revision: 2c79c87a1906498845542607d1293fc10acafb90
+ revision: 793ff00442723b2ff9ed7b7fb39cae2f5608cc2b
branch: main
specs:
actioncable (7.2.0.alpha)
@@ -334,7 +334,7 @@ GEM
rdoc (6.6.3.1)
psych (>= 4.0.0)
regexp_parser (2.9.0)
- reline (0.5.4)
+ reline (0.5.5)
io-console (~> 0.5)
rexml (3.2.6)
rubocop (1.63.4)
@@ -494,7 +494,7 @@ DEPENDENCIES
webmock
RUBY VERSION
- ruby 3.3.0p0
+ ruby 3.3.1p55
BUNDLED WITH
- 2.5.4
+ 2.5.9
diff --git a/README.md b/README.md
index 7c3ecb81..2d782ff9 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ You can find [detailed setup guides for self hosting here](docs/self-hosting.md)
### Requirements
-- Ruby >3 (see `Gemfile`)
+- Ruby 3.3.1
- PostgreSQL >9.3 (ideally, latest stable version)
After cloning the repo, the basic setup commands are: