diff --git a/.github/workflows/rails-tests.yml b/.github/workflows/rails-tests.yml index f15f45579..f3d8f1b35 100644 --- a/.github/workflows/rails-tests.yml +++ b/.github/workflows/rails-tests.yml @@ -43,9 +43,9 @@ jobs: # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby, # change this to (see https://github.com/ruby/setup-ruby#versioning): # uses: ruby/setup-ruby@v1 - uses: ruby/setup-ruby@v1.115.3 + uses: ruby/setup-ruby@v1.117.0 with: - ruby-version: jruby-9.3.7.0 + ruby-version: jruby-9.3.8.0 bundler-cache: true # runs 'bundle install' and caches installed gems automatically - name: Configure externals run: bundle exec cap local externals:setup diff --git a/.ruby-version b/.ruby-version index 6ca1621d3..4b56eecba 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -jruby-9.3.7.0 +jruby-9.3.8.0 diff --git a/Dockerfile b/Dockerfile index 1b69e3d34..b5a9802a1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ RUN git clone https://github.com/rbenv/rbenv.git .rbenv ENV PATH /root/.rbenv/bin:/root/.rbenv/shims:$PATH RUN echo 'eval "$(rbenv init -)"' > /etc/profile.d/rbenv.sh RUN chmod +x /etc/profile.d/rbenv.sh -RUN git clone https://github.com/rbenv/ruby-build.git "$(rbenv root)"/plugins/ruby-build && cd "$(rbenv root)"/plugins/ruby-build && git checkout v20220825 +RUN git clone https://github.com/rbenv/ruby-build.git "$(rbenv root)"/plugins/ruby-build && cd "$(rbenv root)"/plugins/ruby-build && git checkout v20220910.1 RUN git clone https://github.com/rbenv/rbenv-vars.git $(rbenv root)/plugins/rbenv-vars # Copy in secret files diff --git a/Gemfile b/Gemfile index 50c97edba..5ea59629c 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ # Edit this Gemfile to bundle your application's dependencies. # This preamble is the current preamble for Rails 3 apps; edit as needed. source 'https://rubygems.org' -ruby '2.6.8', engine: 'jruby', engine_version: '9.3.7.0' +ruby '2.6.8', engine: 'jruby', engine_version: '9.3.8.0' gem 'rails', '~> 6.1.5' diff --git a/Gemfile.lock b/Gemfile.lock index f7d1ada07..79bd9b212 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -165,7 +165,7 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - jruby-jars (9.3.7.0) + jruby-jars (9.3.8.0) json (2.6.2) json (2.6.2-java) jwt (2.5.0) @@ -407,7 +407,7 @@ DEPENDENCIES jdbc-mysql jdbc-sqlite3 (>= 3.7.2) jquery-rails - jruby-jars (= 9.3.7.0) + jruby-jars (= 9.3.8.0) json (>= 1.6.6) mocha omniauth-google-oauth2 @@ -441,7 +441,7 @@ DEPENDENCIES zip-zip RUBY VERSION - ruby 2.6.8p0 (jruby 9.3.7.0) + ruby 2.6.8p0 (jruby 9.3.8.0) BUNDLED WITH 2.2.32 diff --git a/vendor/cache/jruby-jars-9.3.7.0.gem b/vendor/cache/jruby-jars-9.3.8.0.gem similarity index 77% rename from vendor/cache/jruby-jars-9.3.7.0.gem rename to vendor/cache/jruby-jars-9.3.8.0.gem index 9e39ad2f0..bf4a5bc09 100644 Binary files a/vendor/cache/jruby-jars-9.3.7.0.gem and b/vendor/cache/jruby-jars-9.3.8.0.gem differ