From 24455cc8f173a13ba6f54f46404ae88a1822959f Mon Sep 17 00:00:00 2001 From: Henne Vogelsang Date: Mon, 5 Jul 2021 18:55:33 +0200 Subject: [PATCH] Update default ruby version to 2.5.9 openSUSE 15.2 switched to this ruby version. --- .github/workflows/spec.yml | 3 --- .gitignore | 1 + .ruby-version | 2 +- Gemfile | 2 +- Gemfile.lock | 2 +- 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/spec.yml b/.github/workflows/spec.yml index 17c249cb..23e91bd2 100644 --- a/.github/workflows/spec.yml +++ b/.github/workflows/spec.yml @@ -10,8 +10,6 @@ on: jobs: linters: runs-on: ubuntu-latest - env: - OSEM_RUBY_VERSION: 2.5.9 steps: - uses: actions/checkout@v2 - uses: ruby/setup-ruby@v1 @@ -26,7 +24,6 @@ jobs: name: spec env: OSEM_DB_ADAPTER: sqlite3 - OSEM_RUBY_VERSION: 2.5.9 RAILS_ENV: test strategy: matrix: diff --git a/.gitignore b/.gitignore index 8331c5c8..94b4d90b 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ docker-compose.override.yml .buildconfig osem_development osem_test +.ackrc diff --git a/.ruby-version b/.ruby-version index 437459cd..30f69e8c 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.5.0 +2.5.9 diff --git a/Gemfile b/Gemfile index 783b9c6f..c4fb3a4b 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ 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 if Gem::Version.new(Bundler::VERSION) < Gem::Version.new('1.8.4') diff --git a/Gemfile.lock b/Gemfile.lock index 74882aa9..0af1b406 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -733,7 +733,7 @@ DEPENDENCIES whenever RUBY VERSION - ruby 2.5.8p224 + ruby 2.5.9p229 BUNDLED WITH 1.17.3