Merge pull request #3125 from hennevogel/update/base-os

Update our base os
This commit is contained in:
Henne Vogelsang 2023-02-02 18:58:27 +01:00 committed by GitHub
commit 097470bb0c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 7 additions and 11 deletions

View file

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

View file

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

View file

@ -1 +1 @@
3.1.2
3.1.3

View file

@ -12,10 +12,6 @@ COPY Gemfile /osem/
COPY Gemfile.lock /osem/
RUN chown -R osem /osem
# Install bundler & foreman
RUN gem install bundler -v "$(grep -A 1 "BUNDLED WITH" /osem/Gemfile.lock | tail -n 1)"; \
gem install foreman
# Continue as user
USER osem
WORKDIR /osem/

View file

@ -6,7 +6,7 @@ end
source 'https://rubygems.org'
ruby ENV.fetch('OSEM_RUBY_VERSION', '3.1.2')
ruby ENV.fetch('OSEM_RUBY_VERSION', '3.1.3')
# rails-assets requires >= 1.8.4
if Gem::Version.new(Bundler::VERSION) < Gem::Version.new('1.8.4')

View file

@ -744,7 +744,7 @@ DEPENDENCIES
whenever
RUBY VERSION
ruby 3.1.2
ruby 3.1.3
BUNDLED WITH
2.3.3
2.3.26