Merge pull request #2953 from hennevogel/update/ruby-311

Update default ruby version to 3.1.1
This commit is contained in:
Henne Vogelsang 2022-03-01 15:38:49 +01:00 committed by GitHub
commit f5c8055c9f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 8 deletions

View file

@ -26,7 +26,7 @@ jobs:
echo "BUNDLE_CACHE_PATH=vendor/cache.next" >> $GITHUB_ENV echo "BUNDLE_CACHE_PATH=vendor/cache.next" >> $GITHUB_ENV
- uses: ruby/setup-ruby@v1 - uses: ruby/setup-ruby@v1
with: with:
ruby-version: 3.1.0 ruby-version: 3.1.1
bundler-cache: true bundler-cache: true
- name: Prepare spec - name: Prepare spec
run: | run: |

View file

@ -16,7 +16,7 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- uses: ruby/setup-ruby@v1 - uses: ruby/setup-ruby@v1
with: with:
ruby-version: 3.1.0 ruby-version: 3.1.1
bundler-cache: true bundler-cache: true
- run: bundle exec rubocop - run: bundle exec rubocop
- run: bundle exec haml-lint app/views - run: bundle exec haml-lint app/views
@ -34,7 +34,7 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- uses: ruby/setup-ruby@v1 - uses: ruby/setup-ruby@v1
with: with:
ruby-version: 3.1.0 ruby-version: 3.1.1
bundler-cache: true bundler-cache: true
- name: Prepare spec - name: Prepare spec
run: | run: |

View file

@ -1 +1 @@
3.1.0 3.1.1

View file

@ -5,7 +5,7 @@ end
source 'https://rubygems.org' source 'https://rubygems.org'
ruby ENV['OSEM_RUBY_VERSION'] || '3.1.0' ruby ENV['OSEM_RUBY_VERSION'] || '3.1.1'
# 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

@ -744,7 +744,7 @@ DEPENDENCIES
whenever whenever
RUBY VERSION RUBY VERSION
ruby 3.1.0 ruby 3.1.1
BUNDLED WITH BUNDLED WITH
2.3.3 2.3.3

View file

@ -32,8 +32,8 @@
# OSEM_MEMCACHED_USERNAME='root' # OSEM_MEMCACHED_USERNAME='root'
# OSEM_MEMCACHED_PASSWORD='1234' # OSEM_MEMCACHED_PASSWORD='1234'
# Set this if you want to deviate from our 'standar' ruby version # Set this if you want to deviate from our 'standard' ruby version
# OSEM_RUBY_VERSION=3.1.0 # OSEM_RUBY_VERSION=3.1.1
# What time is it? # What time is it?
# OSEM_TIME_ZONE="UTC" # OSEM_TIME_ZONE="UTC"