From 2e597fcf43cc1ac99c0893775a44e7567c582d67 Mon Sep 17 00:00:00 2001 From: Pete Matsyburka Date: Thu, 25 Apr 2024 18:12:22 +0300 Subject: [PATCH] ruby 3.3.1 --- .github/workflows/ci.yml | 6 +++--- .rubocop.yml | 2 +- Dockerfile | 6 +++--- Gemfile | 3 ++- Gemfile.lock | 6 ++++-- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 585aea41..97bfed01 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: - name: Install Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 3.2.2 + ruby-version: 3.3.1 - name: Cache gems uses: actions/cache@v1 with: @@ -35,7 +35,7 @@ jobs: - name: Install Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 3.2.2 + ruby-version: 3.3.1 - name: Cache gems uses: actions/cache@v1 with: @@ -100,7 +100,7 @@ jobs: - name: Install Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 3.2.2 + ruby-version: 3.3.1 - name: Set up Node uses: actions/setup-node@v1 with: diff --git a/.rubocop.yml b/.rubocop.yml index d538abe7..4c2cd042 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -10,7 +10,7 @@ AllCops: - node_modules/**/* - bin/* - vendor/**/* - TargetRubyVersion: '3.2' + TargetRubyVersion: '3.3' Metrics/BlockLength: Exclude: diff --git a/Dockerfile b/Dockerfile index c12c96ce..c2a44063 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:3.2.2-alpine3.18 as fonts +FROM ruby:3.3.1-alpine3.18 as fonts WORKDIR /fonts @@ -6,7 +6,7 @@ RUN apk --no-cache add fontforge wget && wget https://github.com/satbyy/go-noto- RUN fontforge -lang=py -c 'font1 = fontforge.open("FreeSans.ttf"); font2 = fontforge.open("NotoSansSymbols2-Regular.ttf"); font1.mergeFonts(font2); font1.generate("FreeSans.ttf")' -FROM ruby:3.2.2-alpine3.18 as webpack +FROM ruby:3.3.1-alpine3.18 as webpack ENV RAILS_ENV=production ENV NODE_ENV=production @@ -32,7 +32,7 @@ COPY ./app/views ./app/views RUN echo "gem 'shakapacker'" > Gemfile && ./bin/shakapacker -FROM ruby:3.2.2-alpine3.18 as app +FROM ruby:3.3.1-alpine3.18 as app ENV RAILS_ENV=production ENV BUNDLE_WITHOUT="development:test" diff --git a/Gemfile b/Gemfile index e1d86028..4709da63 100644 --- a/Gemfile +++ b/Gemfile @@ -2,13 +2,14 @@ source 'https://rubygems.org' -ruby '3.2.2' +ruby '3.3.1' gem 'arabic-letter-connector', require: 'arabic-letter-connector/logic' gem 'aws-sdk-s3', require: false gem 'azure-storage-blob', require: false gem 'bootsnap', require: false gem 'cancancan' +gem 'csv' gem 'devise' gem 'devise-two-factor' gem 'dotenv', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 126aac0b..60f21c01 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -149,6 +149,7 @@ GEM crass (1.0.6) css_parser (1.17.1) addressable + csv (3.3.0) cuprite (0.15) capybara (~> 3.0) ferrum (~> 0.14.0) @@ -461,7 +462,7 @@ GEM rspec-mocks (~> 3.13) rspec-support (~> 3.13) rspec-support (3.13.1) - rubocop (1.63.1) + rubocop (1.63.3) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) @@ -585,6 +586,7 @@ DEPENDENCIES bullet cancancan capybara + csv cuprite debug devise @@ -636,7 +638,7 @@ DEPENDENCIES webmock RUBY VERSION - ruby 3.2.2p53 + ruby 3.3.1p55 BUNDLED WITH 2.5.3