From 97737259ae2f40ab0110e57907122444ce59f11b Mon Sep 17 00:00:00 2001
From: tsoganov <sergei.tsoganov@ut.ee>
Date: Tue, 19 Mar 2024 16:28:00 +0200
Subject: [PATCH] Updated ruby version

---
 .github/workflows/ruby.yml         | 24 ++++++++++--------------
 .ruby-version                      |  2 +-
 Dockerfile                         |  3 +--
 config/environments/development.rb |  2 +-
 4 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
index f5ac2144..7fde2aaf 100644
--- a/.github/workflows/ruby.yml
+++ b/.github/workflows/ruby.yml
@@ -16,13 +16,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04]
-        ruby: [2.6, 2.7]
+        os: [ubuntu-22.04]
+        ruby: ['2.7', '3.0.3']
     runs-on: ${{ matrix.os }}
     continue-on-error: ${{ endsWith(matrix.ruby, 'head') || matrix.ruby == 'debug' }}
     steps:
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
@@ -55,9 +55,6 @@ jobs:
           chmod +x ./cc-test-reporter
           ./cc-test-reporter before-build
 
-      - name: setup-chromedriver
-        uses: nanasess/setup-chromedriver@v1.1.0
-
       - name: Run Tests
         env:
           PG_DATABASE: postgres
@@ -75,13 +72,17 @@ jobs:
       - name: Save coverage
         run: ./cc-test-reporter format-coverage --output coverage/codeclimate.${{ matrix.ruby }}.json
 
-      - uses: actions/upload-artifact@v3.1.2
+      - uses: actions/upload-artifact@v3.1.3
         with:
           name: coverage-${{ matrix.ruby }}
           path: coverage/codeclimate.${{ matrix.ruby }}.json
 
   upload_coverage:
-    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ '2.7', '3.0.3' ]
+    runs-on: ubuntu-22.04
 
     env:
       CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
@@ -98,12 +99,7 @@ jobs:
 
       - uses: actions/download-artifact@v3.0.2
         with:
-          name: coverage-2.6
-          path: coverage
-
-      - uses: actions/download-artifact@v3.0.2
-        with:
-          name: coverage-2.7
+          name: coverage-${{ matrix.ruby }}
           path: coverage
 
       - name: Aggregate & upload results to Code Climate
diff --git a/.ruby-version b/.ruby-version
index ff365e06..75a22a26 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.1.3
+3.0.3
diff --git a/Dockerfile b/Dockerfile
index 0ee5baad..9c46182a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,4 @@
-FROM internetee/ruby:2.7
-MAINTAINER maciej.szlosarczyk@internet.ee
+FROM internetee/ruby:3.0-buster
 
 RUN mkdir -p /opt/webapps/app/tmp/pids
 WORKDIR /opt/webapps/app
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 178cee43..8a3fed05 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -57,5 +57,5 @@
 
   # Use an evented file watcher to asynchronously detect changes in source code,
   # routes, locales, etc. This feature depends on the listen gem.
-  config.file_watcher = ActiveSupport::EventedFileUpdateChecker
+  # config.file_watcher = ActiveSupport::EventedFileUpdateChecker
 end