diff --git a/.gitea/workflows/test.yaml b/.gitea/workflows/test.yaml index c1ba4a8..49434c3 100644 --- a/.gitea/workflows/test.yaml +++ b/.gitea/workflows/test.yaml @@ -12,7 +12,7 @@ jobs: - run: | apt-get install -y autoconf patch build-essential rustc libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libgmp-dev libncurses5-dev libffi-dev libgdbm6 libgdbm-dev libdb-dev uuid-dev - uses: actions/checkout@v4 - - uses: https://github.com/ruby/setup-ruby@217c988b8c2bf2bacb2d5c78a7e7b18f8c34daed + - uses: https://github.com/ruby/setup-ruby@bfefad842bb982ff05b233bcbc1571d97a87e69f - uses: actions/cache@v4 with: path: vendor/bundle diff --git a/Dockerfile b/Dockerfile index 4687452..322fc6d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ # For a containerized dev environment, see Dev Containers: https://guides.rubyonrails.org/getting_started_with_devcontainer.html # Make sure RUBY_VERSION matches the Ruby version in .ruby-version -ARG RUBY_VERSION=3.3.6 +ARG RUBY_VERSION=3.4.1 FROM docker.io/library/ruby:$RUBY_VERSION-slim AS base # Rails app lives here diff --git a/Gemfile b/Gemfile index 49a3e7c..c57898b 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,7 @@ source "https://rubygems.org" +ruby file: ".ruby-version" + gem "rails", github: "rails/rails", branch: "main" # The modern asset pipeline for Rails [https://github.com/rails/propshaft] gem "propshaft" diff --git a/Gemfile.lock b/Gemfile.lock index 1428117..b700238 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -110,7 +110,7 @@ GEM bindex (0.8.1) bootsnap (1.18.4) msgpack (~> 1.2) - brakeman (6.2.2) + brakeman (7.0.0) racc builder (3.3.0) capybara (3.40.0) @@ -165,6 +165,7 @@ GEM marcel (1.0.4) matrix (0.4.2) mini_mime (1.1.5) + mini_portile2 (2.8.8) minitest (5.25.2) msgpack (1.7.5) net-imap (0.5.1) @@ -177,11 +178,8 @@ GEM net-smtp (0.5.0) net-protocol nio4r (2.7.4) - nokogiri (1.18.1-aarch64-linux-gnu) - racc (~> 1.4) - nokogiri (1.18.1-arm64-darwin) - racc (~> 1.4) - nokogiri (1.18.1-x86_64-linux-gnu) + nokogiri (1.16.7) + mini_portile2 (~> 2.8.2) racc (~> 1.4) parallel (1.26.3) parser (3.3.6.0) @@ -269,9 +267,8 @@ GEM fugit (~> 1.11.0) railties (>= 7.1) thor (~> 1.3.1) - sqlite3 (2.5.0-aarch64-linux-gnu) - sqlite3 (2.5.0-arm64-darwin) - sqlite3 (2.5.0-x86_64-linux-gnu) + sqlite3 (2.3.1) + mini_portile2 (~> 2.8.0) stimulus-rails (1.3.4) railties (>= 6.0.0) stringio (3.1.2) @@ -334,5 +331,8 @@ DEPENDENCIES tzinfo-data web-console +RUBY VERSION + ruby 3.4.1p0 + BUNDLED WITH - 2.5.23 + 2.6.2