From a8689e804c242d085108b18fa4b4ff8180a6c0b7 Mon Sep 17 00:00:00 2001
From: Sean Carroll <sean@immersive.ch>
Date: Sun, 12 Jun 2022 23:27:06 +0200
Subject: [PATCH 1/8] Improve CI config

---
 .github/workflows/test.yml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 81b99e1..ddafbeb 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -2,8 +2,6 @@ name: Tests
 on:
   pull_request:
   push:
-    branches:
-      - master
 permissions:
   contents: read
 
@@ -12,8 +10,15 @@ jobs:
     runs-on: ubuntu-18.04
     strategy:
       matrix:
-        ruby_version: ['3.1', '3.0', '2.7']
-        rails_version: ['6.0.x', '6.1.x', '7.0.x', 'edge']
+        ruby_version:
+          - 2.7
+          - 3.0
+          - 3.1
+        rails_version:
+          - 6.0.5
+          - 6.1.6
+          - 7.0.3
+          - edge
     name: Ruby ${{ matrix.ruby_version }} on Rails ${{ matrix.rails_version }}
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/Gemfile-rails.${{ matrix.rails_version }}

From 479eb7472b34cc148a5978c1487b189c7237b476 Mon Sep 17 00:00:00 2001
From: Sean Carroll <sean@immersive.ch>
Date: Sun, 12 Jun 2022 23:27:30 +0200
Subject: [PATCH 2/8] Delete old travis config

---
 .travis.yml | 56 -----------------------------------------------------
 1 file changed, 56 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index ed2c60c..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-language: ruby
-rvm:
-  - 2.2
-  - 2.3
-  - 2.4
-  - 2.5
-  - 2.6
-  - 2.7
-  - 3.0
-  - 3.1
-  - jruby
-gemfile:
-  - gemfiles/Gemfile-rails.4.2.x
-  - gemfiles/Gemfile-rails.5.0.x
-  - gemfiles/Gemfile-rails.5.1.x
-  - gemfiles/Gemfile-rails.5.2.x
-  - gemfiles/Gemfile-rails.6.0.x
-  - gemfiles/Gemfile-rails.6.1.x
-  - gemfiles/Gemfile-rails.7.0.x
-  - gemfiles/Gemfile-rails.edge
-before_install:
-  - gem install bundler -v '< 2'
-  - sudo apt-get update -qq
-  - sudo apt-get install -qq graphviz
-script: bundle exec rake
-matrix:
-  allow_failures:
-    - rvm: jruby
-    - gemfile: gemfiles/Gemfile-rails.edge
-  fast_finish: true
-  exclude:
-    - rvm: 2.2
-      gemfile: gemfiles/Gemfile-rails.6.0.x
-    - rvm: 2.2
-      gemfile: gemfiles/Gemfile-rails.6.1.x
-    - rvm: 2.2
-      gemfile: gemfiles/Gemfile-rails.7.0.x
-    - rvm: 2.2
-      gemfile: gemfiles/Gemfile-rails.edge
-    - rvm: 2.3
-      gemfile: gemfiles/Gemfile-rails.6.0.x
-    - rvm: 2.3
-      gemfile: gemfiles/Gemfile-rails.6.1.x
-    - rvm: 2.3
-      gemfile: gemfiles/Gemfile-rails.7.0.x
-    - rvm: 2.3
-      gemfile: gemfiles/Gemfile-rails.edge
-    - rvm: 2.4
-      gemfile: gemfiles/Gemfile-rails.6.0.x
-    - rvm: 2.4
-      gemfile: gemfiles/Gemfile-rails.6.1.x
-    - rvm: 2.4
-      gemfile: gemfiles/Gemfile-rails.7.0.x
-    - rvm: 2.4
-      gemfile: gemfiles/Gemfile-rails.edge
-cache: bundler

From 5a83b8f094e1aa42cd3fbde3eb1a8c486f71a7f7 Mon Sep 17 00:00:00 2001
From: Sean Carroll <sean@immersive.ch>
Date: Sun, 12 Jun 2022 23:48:41 +0200
Subject: [PATCH 3/8] Bundle matrixed Rails versions

---
 .github/workflows/test.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ddafbeb..d3f8c38 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -15,9 +15,10 @@ jobs:
           - 3.0
           - 3.1
         rails_version:
-          - 6.0.5
-          - 6.1.6
-          - 7.0.3
+          - 5.2.x
+          - 6.0.x
+          - 6.1.x
+          - 7.0.x
           - edge
     name: Ruby ${{ matrix.ruby_version }} on Rails ${{ matrix.rails_version }}
     env:
@@ -32,6 +33,7 @@ jobs:
       with:
         ruby-version: ${{ matrix.ruby_version }}
         bundler-cache: true
+    - name: Install dependencies
+      run: bundle install
     - name: Run tests
-      run: |
-        bundle exec rake test
+      run: bundle exec rake test

From 4d658178890d7fac9777e6a88b1e18aeae31b331 Mon Sep 17 00:00:00 2001
From: Sean Carroll <sean@immersive.ch>
Date: Sun, 12 Jun 2022 23:51:39 +0200
Subject: [PATCH 4/8] Update Gemfile matrix

---
 gemfiles/Gemfile-rails.4.2.x | 22 ----------------------
 gemfiles/Gemfile-rails.5.0.x | 22 ----------------------
 gemfiles/Gemfile-rails.5.1.x | 21 ---------------------
 gemfiles/Gemfile-rails.5.2.x |  2 +-
 gemfiles/Gemfile-rails.6.0.x |  2 +-
 gemfiles/Gemfile-rails.6.1.x |  2 +-
 gemfiles/Gemfile-rails.7.0.x |  2 +-
 7 files changed, 4 insertions(+), 69 deletions(-)
 delete mode 100644 gemfiles/Gemfile-rails.4.2.x
 delete mode 100644 gemfiles/Gemfile-rails.5.0.x
 delete mode 100644 gemfiles/Gemfile-rails.5.1.x

diff --git a/gemfiles/Gemfile-rails.4.2.x b/gemfiles/Gemfile-rails.4.2.x
deleted file mode 100644
index 6c0bb7b..0000000
--- a/gemfiles/Gemfile-rails.4.2.x
+++ /dev/null
@@ -1,22 +0,0 @@
-source "http://rubygems.org"
-
-gemspec :path => ".."
-
-gem "activerecord", "~> 4.2.0"
-
-group :development do
-  gem 'minitest', '5.10.1'
-  gem 'mocha'
-  gem "rake"
-  gem "yard"
-
-  platforms :ruby do
-    gem "sqlite3", '~> 1.3.13'
-    gem "redcarpet"
-  end
-
-  platforms :jruby do
-    gem "activerecord-jdbcsqlite3-adapter"
-    gem "jruby-openssl", :require => false # Silence openssl warnings.
-  end
-end
diff --git a/gemfiles/Gemfile-rails.5.0.x b/gemfiles/Gemfile-rails.5.0.x
deleted file mode 100644
index fa75b47..0000000
--- a/gemfiles/Gemfile-rails.5.0.x
+++ /dev/null
@@ -1,22 +0,0 @@
-source "http://rubygems.org"
-
-gemspec :path => ".."
-
-gem "activerecord", "~> 5.0.2"
-
-group :development do
-  gem 'minitest', '5.10.1'
-  gem 'mocha'
-  gem "rake"
-  gem "yard"
-
-  platforms :ruby do
-    gem "sqlite3", '~> 1.3.13'
-    gem "redcarpet"
-  end
-
-  platforms :jruby do
-    gem "activerecord-jdbcsqlite3-adapter"
-    gem "jruby-openssl", :require => false # Silence openssl warnings.
-  end
-end
diff --git a/gemfiles/Gemfile-rails.5.1.x b/gemfiles/Gemfile-rails.5.1.x
deleted file mode 100644
index b49f845..0000000
--- a/gemfiles/Gemfile-rails.5.1.x
+++ /dev/null
@@ -1,21 +0,0 @@
-source "http://rubygems.org"
-
-gemspec :path => ".."
-
-gem "activerecord", "~> 5.1.0"
-
-group :development do
-  gem 'mocha'
-  gem "rake"
-  gem "yard"
-
-  platforms :ruby do
-    gem "sqlite3", '~> 1.3.13'
-    gem "redcarpet"
-  end
-
-  platforms :jruby do
-    gem "activerecord-jdbcsqlite3-adapter"
-    gem "jruby-openssl", :require => false # Silence openssl warnings.
-  end
-end
diff --git a/gemfiles/Gemfile-rails.5.2.x b/gemfiles/Gemfile-rails.5.2.x
index 8cc4839..e3dcdba 100644
--- a/gemfiles/Gemfile-rails.5.2.x
+++ b/gemfiles/Gemfile-rails.5.2.x
@@ -2,7 +2,7 @@ source "http://rubygems.org"
 
 gemspec :path => ".."
 
-gem "activerecord", "~> 5.2.0"
+gem "activerecord", "~> 5.2.8"
 
 group :development do
   gem 'mocha'
diff --git a/gemfiles/Gemfile-rails.6.0.x b/gemfiles/Gemfile-rails.6.0.x
index dcc5e72..08c3098 100644
--- a/gemfiles/Gemfile-rails.6.0.x
+++ b/gemfiles/Gemfile-rails.6.0.x
@@ -2,7 +2,7 @@ source "http://rubygems.org"
 
 gemspec :path => ".."
 
-gem "activerecord", "~> 6.0.0rc1"
+gem "activerecord", "~> 6.0.5"
 
 group :development do
   gem 'mocha'
diff --git a/gemfiles/Gemfile-rails.6.1.x b/gemfiles/Gemfile-rails.6.1.x
index f686f7b..4bf32a4 100644
--- a/gemfiles/Gemfile-rails.6.1.x
+++ b/gemfiles/Gemfile-rails.6.1.x
@@ -2,7 +2,7 @@ source "http://rubygems.org"
 
 gemspec :path => ".."
 
-gem "activerecord", "~> 6.1.1"
+gem "activerecord", "~> 6.1.6"
 
 group :development do
   gem 'mocha'
diff --git a/gemfiles/Gemfile-rails.7.0.x b/gemfiles/Gemfile-rails.7.0.x
index 61f08e2..712e21b 100644
--- a/gemfiles/Gemfile-rails.7.0.x
+++ b/gemfiles/Gemfile-rails.7.0.x
@@ -2,7 +2,7 @@ source "http://rubygems.org"
 
 gemspec :path => ".."
 
-gem "activerecord", "~> 7.0.0"
+gem "activerecord", "~> 7.0.3"
 
 group :development do
   gem 'mocha'

From 5cfc08342441b488d731fea051294d41224dc57f Mon Sep 17 00:00:00 2001
From: Sean Carroll <sean@immersive.ch>
Date: Mon, 13 Jun 2022 00:02:01 +0200
Subject: [PATCH 5/8] Specify Ruby versions

---
 .github/workflows/test.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d3f8c38..eef3523 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -11,9 +11,9 @@ jobs:
     strategy:
       matrix:
         ruby_version:
-          - 2.7
-          - 3.0
-          - 3.1
+          - 2.7.6
+          - 3.0.4
+          - 3.1.2
         rails_version:
           - 5.2.x
           - 6.0.x

From b270c0178da559591b603d28a4aa41ee84277570 Mon Sep 17 00:00:00 2001
From: Sean Carroll <sean@immersive.ch>
Date: Mon, 13 Jun 2022 00:09:34 +0200
Subject: [PATCH 6/8] sqllite version

---
 .github/workflows/test.yml   |  1 -
 Gemfile                      |  6 +++---
 gemfiles/Gemfile-rails.5.2.x | 21 ---------------------
 gemfiles/Gemfile-rails.6.0.x |  2 +-
 gemfiles/Gemfile-rails.6.1.x |  2 +-
 gemfiles/Gemfile-rails.7.0.x |  2 +-
 6 files changed, 6 insertions(+), 28 deletions(-)
 delete mode 100644 gemfiles/Gemfile-rails.5.2.x

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index eef3523..aa48786 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -15,7 +15,6 @@ jobs:
           - 3.0.4
           - 3.1.2
         rails_version:
-          - 5.2.x
           - 6.0.x
           - 6.1.x
           - 7.0.x
diff --git a/Gemfile b/Gemfile
index 8bedd34..26d576b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,7 +8,7 @@ end
 
 
 group :development, :test do
-  gem 'minitest', '~> 5.14.0'
+  gem 'minitest'
 end
 
 group :development do
@@ -19,7 +19,7 @@ group :development do
   platforms :ruby do
     gem "activerecord", "< 7.0"
     gem "activesupport", "< 7.0"
-    gem "sqlite3", '~> 1.4'
+    gem "sqlite3"
     gem "redcarpet"
 
     if RUBY_VERSION > "2.1.0"
@@ -31,4 +31,4 @@ group :development do
     gem "activerecord-jdbcsqlite3-adapter"
     gem "jruby-openssl", :require => false # Silence openssl warnings.
   end
-end
\ No newline at end of file
+end
diff --git a/gemfiles/Gemfile-rails.5.2.x b/gemfiles/Gemfile-rails.5.2.x
deleted file mode 100644
index e3dcdba..0000000
--- a/gemfiles/Gemfile-rails.5.2.x
+++ /dev/null
@@ -1,21 +0,0 @@
-source "http://rubygems.org"
-
-gemspec :path => ".."
-
-gem "activerecord", "~> 5.2.8"
-
-group :development do
-  gem 'mocha'
-  gem "rake"
-  gem "yard"
-
-  platforms :ruby do
-    gem "sqlite3", '~> 1.3.13'
-    gem "redcarpet"
-  end
-
-  platforms :jruby do
-    gem "activerecord-jdbcsqlite3-adapter"
-    gem "jruby-openssl", :require => false # Silence openssl warnings.
-  end
-end
diff --git a/gemfiles/Gemfile-rails.6.0.x b/gemfiles/Gemfile-rails.6.0.x
index 08c3098..18107ca 100644
--- a/gemfiles/Gemfile-rails.6.0.x
+++ b/gemfiles/Gemfile-rails.6.0.x
@@ -10,7 +10,7 @@ group :development do
   gem "yard"
 
   platforms :ruby do
-    gem "sqlite3", '~> 1.4'
+    gem "sqlite3"
     gem "redcarpet"
   end
 
diff --git a/gemfiles/Gemfile-rails.6.1.x b/gemfiles/Gemfile-rails.6.1.x
index 4bf32a4..bb7cfa7 100644
--- a/gemfiles/Gemfile-rails.6.1.x
+++ b/gemfiles/Gemfile-rails.6.1.x
@@ -10,7 +10,7 @@ group :development do
   gem "yard"
 
   platforms :ruby do
-    gem "sqlite3", '~> 1.4'
+    gem "sqlite3"
     gem "redcarpet"
   end
 
diff --git a/gemfiles/Gemfile-rails.7.0.x b/gemfiles/Gemfile-rails.7.0.x
index 712e21b..2d043b9 100644
--- a/gemfiles/Gemfile-rails.7.0.x
+++ b/gemfiles/Gemfile-rails.7.0.x
@@ -10,7 +10,7 @@ group :development do
   gem "yard"
 
   platforms :ruby do
-    gem "sqlite3", '~> 1.4'
+    gem "sqlite3"
     gem "redcarpet"
   end
 

From 35bae4084cd720192bd4f4d2adbed26c07344403 Mon Sep 17 00:00:00 2001
From: Sean Carroll <sean@immersive.ch>
Date: Mon, 13 Jun 2022 00:30:13 +0200
Subject: [PATCH 7/8] Apply reviewer suggestions

---
 .github/workflows/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index aa48786..8b34225 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -2,6 +2,8 @@ name: Tests
 on:
   pull_request:
   push:
+    branches:
+      - master
 permissions:
   contents: read
 
@@ -32,7 +34,5 @@ jobs:
       with:
         ruby-version: ${{ matrix.ruby_version }}
         bundler-cache: true
-    - name: Install dependencies
-      run: bundle install
     - name: Run tests
       run: bundle exec rake test

From 1b9084bc97b47d3f02291b47f789194e06b40e15 Mon Sep 17 00:00:00 2001
From: Sean Carroll <sean@immersive.ch>
Date: Mon, 13 Jun 2022 22:09:28 +0200
Subject: [PATCH 8/8] sqlite

---
 .github/workflows/test.yml   |  1 -
 Gemfile                      |  2 +-
 gemfiles/Gemfile-rails.6.0.x |  2 +-
 gemfiles/Gemfile-rails.6.1.x |  2 +-
 gemfiles/Gemfile-rails.7.0.x |  2 +-
 gemfiles/Gemfile-rails.edge  | 21 ---------------------
 6 files changed, 4 insertions(+), 26 deletions(-)
 delete mode 100644 gemfiles/Gemfile-rails.edge

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8b34225..ff90515 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -20,7 +20,6 @@ jobs:
           - 6.0.x
           - 6.1.x
           - 7.0.x
-          - edge
     name: Ruby ${{ matrix.ruby_version }} on Rails ${{ matrix.rails_version }}
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/Gemfile-rails.${{ matrix.rails_version }}
diff --git a/Gemfile b/Gemfile
index 26d576b..fb15180 100644
--- a/Gemfile
+++ b/Gemfile
@@ -19,7 +19,7 @@ group :development do
   platforms :ruby do
     gem "activerecord", "< 7.0"
     gem "activesupport", "< 7.0"
-    gem "sqlite3"
+    gem "sqlite3", '~> 1.4'
     gem "redcarpet"
 
     if RUBY_VERSION > "2.1.0"
diff --git a/gemfiles/Gemfile-rails.6.0.x b/gemfiles/Gemfile-rails.6.0.x
index 18107ca..08c3098 100644
--- a/gemfiles/Gemfile-rails.6.0.x
+++ b/gemfiles/Gemfile-rails.6.0.x
@@ -10,7 +10,7 @@ group :development do
   gem "yard"
 
   platforms :ruby do
-    gem "sqlite3"
+    gem "sqlite3", '~> 1.4'
     gem "redcarpet"
   end
 
diff --git a/gemfiles/Gemfile-rails.6.1.x b/gemfiles/Gemfile-rails.6.1.x
index bb7cfa7..4bf32a4 100644
--- a/gemfiles/Gemfile-rails.6.1.x
+++ b/gemfiles/Gemfile-rails.6.1.x
@@ -10,7 +10,7 @@ group :development do
   gem "yard"
 
   platforms :ruby do
-    gem "sqlite3"
+    gem "sqlite3", '~> 1.4'
     gem "redcarpet"
   end
 
diff --git a/gemfiles/Gemfile-rails.7.0.x b/gemfiles/Gemfile-rails.7.0.x
index 2d043b9..712e21b 100644
--- a/gemfiles/Gemfile-rails.7.0.x
+++ b/gemfiles/Gemfile-rails.7.0.x
@@ -10,7 +10,7 @@ group :development do
   gem "yard"
 
   platforms :ruby do
-    gem "sqlite3"
+    gem "sqlite3", '~> 1.4'
     gem "redcarpet"
   end
 
diff --git a/gemfiles/Gemfile-rails.edge b/gemfiles/Gemfile-rails.edge
deleted file mode 100644
index 523a0fb..0000000
--- a/gemfiles/Gemfile-rails.edge
+++ /dev/null
@@ -1,21 +0,0 @@
-source "http://rubygems.org"
-
-gemspec :path => ".."
-
-gem "activerecord", :git => "https://github.com/rails/rails", :branch => "main"
-
-group :development do
-  gem 'mocha'
-  gem "rake"
-  gem "yard"
-
-  platforms :ruby do
-    gem "sqlite3"
-    gem "redcarpet"
-  end
-
-  platforms :jruby do
-    gem "activerecord-jdbcsqlite3-adapter"
-    gem "jruby-openssl", :require => false # Silence openssl warnings.
-  end
-end