Merge branch 'master' of github.com:sosol/sosol

.github/workflows/rails-tests.yml

@@ -29,7 +29,7 @@ jobs:
         ports:
           - 5432:5432
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Install dependencies
       run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev git
     - name: Configure sysctl limits
@@ -40,12 +40,9 @@ jobs:
         sudo sysctl -w fs.file-max=262144
         sudo sysctl -w vm.max_map_count=262144
     - name: Set up Ruby
-    # 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.100.0
+      uses: ruby/setup-ruby@v1
       with:
-        ruby-version: jruby-9.3.4.0
+        ruby-version: jruby-9.3.9.0
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically
     - name: Configure externals
       run: bundle exec cap local externals:setup
@@ -61,7 +58,7 @@ jobs:
         DATABASE_HOSTNAME: localhost
         DATABASE_POOL: 16
     - name: Upload test logs
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       if: always()
       with:
         name: logs

.ruby-version

@@ -1 +1 @@
-jruby-9.3.4.0
+jruby-9.3.9.0

Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:focal
+FROM ubuntu:jammy
 MAINTAINER Ryan Baumann <ryan.baumann@gmail.com>
 
 # Install the Ubuntu packages.
@@ -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 v20220324
+RUN git clone https://github.com/rbenv/ruby-build.git "$(rbenv root)"/plugins/ruby-build && cd "$(rbenv root)"/plugins/ruby-build && git checkout v20221116
 RUN git clone https://github.com/rbenv/rbenv-vars.git $(rbenv root)/plugins/rbenv-vars
 
 # Copy in secret files

Gemfile

@@ -1,13 +1,13 @@
 # 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.4.0'
+ruby '2.6.8', engine: 'jruby', engine_version: '9.3.9.0'
 
 gem 'rails', '~> 6.1.5'
 
 # Needed for the new asset pipeline
 gem 'coffee-rails'
-gem 'sass-rails', '~> 5'
+gem 'sass-rails', '~> 6'
 gem 'therubyrhino'
 gem 'uglifier', '>= 1.0.3'
 
@@ -17,7 +17,6 @@ group :test do
   gem 'mocha'
   gem 'rails-controller-testing'
   gem 'rake'
-  gem 'shoulda'
   gem 'shoulda-context'
   gem 'shoulda-matchers'
 end
@@ -56,15 +55,15 @@ gem 'omniauth-google-oauth2'
 gem 'omniauth-rails_csrf_protection'
 gem 'pry', '~> 0.14.0'
 gem 'pry-rails', '~> 0.3.9'
-gem 'puma', '>= 5.6.2'
+gem 'puma', '< 7'
 gem 'rack', '>= 1.1.0'
-gem 'rack-attack', '~> 4.0'
+gem 'rack-attack', '~> 6.0'
 gem 'rapporteur'
 gem 'rexml'
-gem 'rubyzip', '~> 1.0'
+gem 'rubyzip', '~> 2'
 gem 'silencer'
-gem 'sucker_punch', '~> 2.0'
+gem 'sucker_punch', '~> 3.0'
 gem 'tzinfo-data', platform: :jruby
-gem 'warbler', '~> 2.0'
+gem 'webrick'
 gem 'with_advisory_lock'
 gem 'zip-zip'