Merge branches 'dev', 'infra' and 'oad_schemas' into HEAD

.github/workflows/test.yml

@@ -1,7 +1,25 @@
 name: test
 on:
 - push
+- pull_request
 jobs:
+  gig:
+    runs-on: ubuntu-latest
+
+    env:
+      BUNDLE_WITHOUT: dev test doc # ruby/setup-ruby's invocation of bundle install will be without these groups
+
+    steps:
+
+    - uses: actions/checkout@v4
+
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: head
+        bundler-cache: true
+
+    - run: bundle exec rake gig
+
   test:
     strategy:
       fail-fast: false
@@ -19,9 +37,12 @@ jobs:
 
     runs-on: ${{ matrix.runs-on }}
 
+    env:
+      BUNDLE_WITHOUT: dev doc # ruby/setup-ruby's invocation of bundle install will be without these groups
+
     steps:
 
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
 
@@ -33,7 +54,7 @@ jobs:
     - run: bundle exec rake test:each_format
 
     - name: Report to Coveralls
-      uses: coverallsapp/github-action@1.1.3
+      uses: coverallsapp/github-action@v2.3.4
       with:
         github-token: ${{ secrets.github_token }}
         flag-name: "ruby: ${{ matrix.ruby-version }} os: ${{ matrix.runs-on }}"
@@ -45,7 +66,7 @@ jobs:
     steps:
 
     - name: Report completion to Coveralls
-      uses: coverallsapp/github-action@1.1.3
+      uses: coverallsapp/github-action@v2.3.4
       with:
         github-token: ${{ secrets.github_token }}
         parallel-finished: true

Gemfile

@@ -2,29 +2,59 @@ source 'https://rubygems.org'
 
 gemspec
 
+group(:dev) do
+  platform(:mri) do
+    if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.7')
+      gem('debug', '> 1')
+    else
+      gem('byebug')
+    end
+  end
+  platform(:jruby) { gem('ruby-debug') }
+end
+
 gem 'rake'
 gem 'gig'
-gem 'minitest', '~> 5.0'
-gem 'minitest-around'
-gem 'minitest-reporters'
-gem 'simplecov'
-gem 'simplecov-lcov'
-gem 'sinatra', '~> 1.0'
-gem 'rack', '~> 1.0'
-gem 'rack-accept'
-gem 'rack-test'
-gem 'webrick'
-gem 'api_hammer'
-activerecord_version =
-  RUBY_ENGINE == 'truffleruby' ? '>= 6' : # TODO rm why is truffleruby using 5.x without this?
-  RUBY_ENGINE == 'jruby' ? '< 7.1' : # TODO rm. some incompatibility with activerecord-jdbc-adapter at 7.1
-  nil
-gem('activerecord', *activerecord_version)
-platform(:mri, :truffleruby) do
-  gem 'sqlite3', '~> 1.4' # loosen this in accordance with active_record/connection_adapters/sqlite3_adapter.rb
+
+group(:test) do
+  gem('minitest', '~> 5.0')
+  gem('minitest-around')
+  gem('minitest-reporters')
+  gem('simplecov')
+  gem('simplecov-lcov')
+  gem('sinatra', '~> 1.0')
+  gem('rack', '~> 1.0')
+  gem('rack-accept')
+  gem('rack-test')
+  gem('webrick')
+  gem('api_hammer')
+
+  # sqlite3 version is in accordance with active_record/connection_adapters/sqlite3_adapter.rb
+  [
+    {activerecord: '~> 8.0', ruby: '3.2', sqlite: '>= 2.1'},
+    {activerecord: '~> 7.2', ruby: '3.1', sqlite: '>= 1.4'},
+    {activerecord: '~> 7.0', ruby: '2.7', sqlite: '>= 1.4'},
+    {activerecord: '~> 6.0', ruby: '2.5', sqlite: '~> 1.4'},
+  ].map(&:values).each do |activerecord, ruby, sqlite|
+    if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new(ruby)
+      if RUBY_ENGINE == 'jruby'
+        # override. update this per released version of activerecord-jdbc-adapter, current latest 70.x corresponding to Rails 7.0.x
+        activerecord = '< 7.1'
+      end
+      gem('activerecord', activerecord)
+
+      platform(:mri, :truffleruby) do
+        gem('sqlite3', sqlite)
+      end
+      break
+    end
+  end
+  platform(:jruby) do
+    gem('activerecord-jdbcsqlite3-adapter')
+  end
+  gem('database_cleaner')
 end
-platform(:jruby) do
-  gem 'activerecord-jdbcsqlite3-adapter'
+
+group(:doc) do
+  gem('yard')
 end
-gem 'database_cleaner'
-gem 'yard'