Skip to content

Commit

Permalink
Merge pull request #633 from etalab/bump/ruby
Browse files Browse the repository at this point in the history
Bump to latest ruby
  • Loading branch information
skelz0r authored Dec 27, 2024
2 parents 36ac36f + 24f7829 commit 744f48c
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 28 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.3.6
3.4.1
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax = docker/dockerfile:1

ARG RUBY_VERSION=3.3.6
ARG RUBY_VERSION=3.4.1
FROM registry.docker.com/library/ruby:$RUBY_VERSION-slim as base

Check warning on line 4 in Dockerfile

View workflow job for this annotation

GitHub Actions / build

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

WORKDIR /app
Expand Down
4 changes: 3 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
source 'https://rubygems.org'

ruby '3.3.6'
ruby '3.4.1'

gem 'active_model_validates_intersection_of'
gem 'active_model_serializers', '~> 0.10.15'
gem 'active_storage_validations'
gem 'caxlsx'
gem 'aws-sdk-s3', require: false
gem 'bootsnap', require: false
gem 'csv'
gem 'draper'
gem 'emailable'
gem 'importmap-rails', '~> 1.0'
Expand Down Expand Up @@ -71,6 +72,7 @@ end

group :test do
gem 'capybara'
gem 'cucumber', require: false, github: 'cucumber/cucumber-ruby'
gem 'cucumber-rails', require: false #, github: 'cucumber/cucumber-rails'
gem 'cuprite'
gem 'database_cleaner-active_record'
Expand Down
51 changes: 27 additions & 24 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
GIT
remote: https://github.com/cucumber/cucumber-ruby.git
revision: 5cec9226789ab1742d5bc36ec3bc194906c58dbc
specs:
cucumber (9.2.0)
builder (~> 3.2)
cucumber-ci-environment (> 9, < 11)
cucumber-core (> 13, < 14)
cucumber-cucumber-expressions (~> 17.0)
cucumber-gherkin (> 24, < 28)
cucumber-html-formatter (> 20.3, < 22)
cucumber-messages (> 19, < 25)
diff-lcs (~> 1.5)
mini_mime (~> 1.1)
multi_test (~> 1.1)
sys-uname (~> 1.2)

GEM
remote: https://rubygems.org/
specs:
Expand Down Expand Up @@ -144,18 +161,7 @@ GEM
bigdecimal
rexml
crass (1.0.6)
cucumber (9.2.0)
builder (~> 3.2)
cucumber-ci-environment (> 9, < 11)
cucumber-core (> 13, < 14)
cucumber-cucumber-expressions (~> 17.0)
cucumber-gherkin (> 24, < 28)
cucumber-html-formatter (> 20.3, < 22)
cucumber-messages (> 19, < 25)
diff-lcs (~> 1.5)
mini_mime (~> 1.1)
multi_test (~> 1.1)
sys-uname (~> 1.2)
csv (3.3.2)
cucumber-ci-environment (10.0.1)
cucumber-core (13.0.3)
cucumber-gherkin (>= 27, < 28)
Expand Down Expand Up @@ -225,9 +231,7 @@ GEM
concurrent-ruby (~> 1.1)
webrick (~> 1.7)
websocket-driver (~> 0.7)
ffi (1.17.0-aarch64-linux-gnu)
ffi (1.17.0-arm64-darwin)
ffi (1.17.0-x86_64-linux-gnu)
ffi (1.17.0)
foreman (0.88.1)
formatador (1.1.0)
friendly_id (5.5.1)
Expand Down Expand Up @@ -341,6 +345,7 @@ GEM
matrix (0.4.2)
method_source (1.1.0)
mini_mime (1.1.5)
mini_portile2 (2.8.8)
minitest (5.25.4)
msgpack (1.7.2)
multi_test (1.1.0)
Expand All @@ -359,11 +364,8 @@ GEM
net-smtp (0.5.0)
net-protocol
nio4r (2.7.4)
nokogiri (1.17.2-aarch64-linux)
racc (~> 1.4)
nokogiri (1.17.2-arm64-darwin)
racc (~> 1.4)
nokogiri (1.17.2-x86_64-linux)
nokogiri (1.17.2)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
notiffany (0.1.3)
nenv (~> 0.1)
Expand Down Expand Up @@ -548,9 +550,8 @@ GEM
snaky_hash (2.0.1)
hashie
version_gem (~> 1.1, >= 1.1.1)
sqlite3 (2.4.1-aarch64-linux-gnu)
sqlite3 (2.4.1-arm64-darwin)
sqlite3 (2.4.1-x86_64-linux-gnu)
sqlite3 (2.4.1)
mini_portile2 (~> 2.8.0)
state_machines (0.6.0)
state_machines-activemodel (0.9.0)
activemodel (>= 6.0)
Expand Down Expand Up @@ -619,6 +620,8 @@ DEPENDENCIES
byebug
capybara
caxlsx
csv
cucumber!
cucumber-rails
cuprite
database_cleaner-active_record
Expand Down Expand Up @@ -682,7 +685,7 @@ DEPENDENCIES
wicked

RUBY VERSION
ruby 3.3.6p108
ruby 3.4.1p0

BUNDLED WITH
2.4.19
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ les seeds disponible [ici](app/lib/seeds.rb)

# Requirements

- ruby 3.3.6
- ruby 3.4.1
- postressql >= 13
- (optional) npm (for [standardjs](https://standardjs.com/) and [prettier](https://prettier.io/))

Expand Down

0 comments on commit 744f48c

Please sign in to comment.