Skip to content

Commit

Permalink
Updated ruby version
Browse files Browse the repository at this point in the history
  • Loading branch information
tsoganov committed Mar 19, 2024
1 parent ffdbb34 commit 9773725
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 18 deletions.
24 changes: 10 additions & 14 deletions .github/workflows/ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -55,9 +55,6 @@ jobs:
chmod +x ./cc-test-reporter
./cc-test-reporter before-build
- name: setup-chromedriver
uses: nanasess/[email protected]

- name: Run Tests
env:
PG_DATABASE: postgres
Expand All @@ -75,13 +72,17 @@ jobs:
- name: Save coverage
run: ./cc-test-reporter format-coverage --output coverage/codeclimate.${{ matrix.ruby }}.json

- uses: actions/[email protected].2
- uses: actions/[email protected].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 }}
Expand All @@ -98,12 +99,7 @@ jobs:

- uses: actions/[email protected]
with:
name: coverage-2.6
path: coverage

- uses: actions/[email protected]
with:
name: coverage-2.7
name: coverage-${{ matrix.ruby }}
path: coverage

- name: Aggregate & upload results to Code Climate
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.1.3
3.0.3
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
FROM internetee/ruby:2.7
MAINTAINER [email protected]
FROM internetee/ruby:3.0-buster

RUN mkdir -p /opt/webapps/app/tmp/pids
WORKDIR /opt/webapps/app
Expand Down
2 changes: 1 addition & 1 deletion config/environments/development.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 9773725

Please sign in to comment.