diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8f81fc4..303a655 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -28,7 +28,7 @@ jobs: - name: Setup Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: "3.1.1" + ruby-version: "3.1.7" - name: Install PostgreSQL 11 client run: | @@ -37,7 +37,7 @@ jobs: env: RAILS_ENV: test run: | - gem install bundler:2.2.29 + gem install bundler:2.3.23 bundle install --jobs 4 --retry 3 yarn install rake db:setup diff --git a/.ruby-version b/.ruby-version index 2a49746..434c481 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -ruby-3.1.1 +ruby-3.1.7 diff --git a/Dockerfile b/Dockerfile index 2e64da2..fe6b0c8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,7 @@ ARG DISTRO_NAME=bullseye +ARG RUBY_VERSION=3.1.7 -FROM ruby:3.1.1-slim-$DISTRO_NAME - -ARG DISTRO_NAME +FROM ruby:$RUBY_VERSION-slim-$DISTRO_NAME RUN apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \ diff --git a/Gemfile b/Gemfile index 7fa307c..01a7ec2 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "https://rubygems.org" git_source(:github) { |repo| "https://github.com/#{repo}.git" } -ruby "3.1.1" +ruby "3.1.7" # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main" gem "rails", "~> 7.0.4" @@ -84,6 +84,5 @@ group :development, :test do gem "overcommit", "0.57.0" gem "next_rails" end -gem "dotenv-rails" gem "dotenv_validator" gem "pagy" diff --git a/Gemfile.lock b/Gemfile.lock index 4404191..1543714 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -211,9 +211,11 @@ GEM net-protocol next_rails (1.2.1) colorize (>= 0.8.1) - nio4r (2.5.8) + nio4r (2.5.9) nokogiri (1.13.9-aarch64-linux) racc (~> 1.4) + nokogiri (1.13.9-arm64-darwin) + racc (~> 1.4) nokogiri (1.13.9-x86_64-darwin) racc (~> 1.4) nokogiri (1.13.9-x86_64-linux) @@ -392,6 +394,8 @@ GEM railties (>= 6.0.0) tailwindcss-rails (2.0.16-aarch64-linux) railties (>= 6.0.0) + tailwindcss-rails (2.0.16-arm64-darwin) + railties (>= 6.0.0) tailwindcss-rails (2.0.16-x86_64-darwin) railties (>= 6.0.0) tailwindcss-rails (2.0.16-x86_64-linux) @@ -430,6 +434,7 @@ GEM PLATFORMS aarch64-linux + arm64-darwin-25 x86_64-darwin-20 x86_64-darwin-21 x86_64-darwin-22 @@ -471,7 +476,7 @@ DEPENDENCIES webdrivers RUBY VERSION - ruby 3.1.1p18 + ruby 3.1.7p261 BUNDLED WITH 2.3.23 diff --git a/docker-compose.yml b/docker-compose.yml index 169af43..7b781c0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,7 +12,7 @@ services: build: context: . args: - RUBY_VERSION: '3.1.1' + RUBY_VERSION: '3.1.7' PG_MAJOR: '14' NODE_MAJOR: '16' YARN_VERSION: '1.22.17'