Skip to content

Commit

Permalink
Merge pull request openSUSE#3125 from hennevogel/update/base-os
Browse files Browse the repository at this point in the history
Update our base os
  • Loading branch information
hennevogel authored Feb 2, 2023
2 parents 41287ae + c5d4686 commit 097470b
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/next-rails.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/spec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.1.2
3.1.3
4 changes: 0 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -744,7 +744,7 @@ DEPENDENCIES
whenever

RUBY VERSION
ruby 3.1.2
ruby 3.1.3

BUNDLED WITH
2.3.3
2.3.26

0 comments on commit 097470b

Please sign in to comment.