Merge remote-tracking branch 'origin/main' into ruby-3-4

.gitea/workflows/license_finder.yml

@@ -14,9 +14,7 @@ jobs:
         - uses: actions/checkout@v4
           with:
             token: ${{ secrets.GITHUB_TOKEN }}
-        - uses: ruby/setup-ruby@v1.202.0
+        - uses: ruby/setup-ruby@v1
-          with:
-            ruby-version: '3.3.6'
         - name: Install project dependencies
           run: bundle install --jobs `getconf _NPROCESSORS_ONLN`
         - name: Run license finder

.ruby-version

@@ -1 +1 @@
-ruby-3.3.6
+ruby-3.4.1

Dockerfile

@@ -1,8 +1,8 @@
 # syntax = docker/dockerfile:1
 
 # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile
-ARG RUBY_VERSION=3.3.6
+ARG RUBY_VERSION=3.4.1
-FROM registry.docker.com/library/ruby:$RUBY_VERSION-slim as base
+FROM registry.docker.com/library/ruby:$RUBY_VERSION-slim AS base
 
 # Rails app lives here
 WORKDIR /rails
@@ -16,7 +16,7 @@ ENV RAILS_ENV="production" \
 RUN apt-get update && apt-get install -y nodejs
 
 # Throw-away build stage to reduce size of final image
-FROM base as build
+FROM base AS build
 
 # Install packages needed to build gems
 RUN apt-get update -qq && \

Dockerfile.dev

@@ -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.6
+ARG RUBY_VERSION=3.4.1
 FROM registry.docker.com/library/ruby:$RUBY_VERSION-slim as base
 
 # Rails app lives here

Gemfile

@@ -2,7 +2,7 @@
 
 source 'https://rubygems.org'
 
-ruby '3.3.6'
+ruby '3.4.1'
 gem 'bootsnap', require: false
 gem 'csv'
 gem 'importmap-rails'