Merge pull request #2780 from hennevogel/update/ruby

Update default ruby version to 2.5.9
This commit is contained in:
Henne Vogelsang 2021-07-05 19:33:53 +02:00 committed by GitHub
commit 3a8647b63c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 4 additions and 6 deletions

View file

@ -10,8 +10,6 @@ on:
jobs: jobs:
linters: linters:
runs-on: ubuntu-latest runs-on: ubuntu-latest
env:
OSEM_RUBY_VERSION: 2.5.9
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- uses: ruby/setup-ruby@v1 - uses: ruby/setup-ruby@v1
@ -26,7 +24,6 @@ jobs:
name: spec name: spec
env: env:
OSEM_DB_ADAPTER: sqlite3 OSEM_DB_ADAPTER: sqlite3
OSEM_RUBY_VERSION: 2.5.9
RAILS_ENV: test RAILS_ENV: test
strategy: strategy:
matrix: matrix:

1
.gitignore vendored
View file

@ -40,3 +40,4 @@ docker-compose.override.yml
.buildconfig .buildconfig
osem_development osem_development
osem_test osem_test
.ackrc

View file

@ -1 +1 @@
2.5.0 2.5.9

View file

@ -2,7 +2,7 @@
source 'https://rubygems.org' source 'https://rubygems.org'
ruby ENV['OSEM_RUBY_VERSION'] || '2.5.8' ruby ENV['OSEM_RUBY_VERSION'] || '2.5.9'
# rails-assets requires >= 1.8.4 # rails-assets requires >= 1.8.4
if Gem::Version.new(Bundler::VERSION) < Gem::Version.new('1.8.4') if Gem::Version.new(Bundler::VERSION) < Gem::Version.new('1.8.4')

View file

@ -733,7 +733,7 @@ DEPENDENCIES
whenever whenever
RUBY VERSION RUBY VERSION
ruby 2.5.8p224 ruby 2.5.9p229
BUNDLED WITH BUNDLED WITH
1.17.3 1.17.3