From 90a042fd36e279e6d1d6a3ec7ca511a5295caca6 Mon Sep 17 00:00:00 2001 From: alpaca-tc Date: Tue, 13 Aug 2024 22:24:15 +0900 Subject: [PATCH 1/4] Remove EOL ruby 3.0 EOL 2024-04-23 --- .github/workflows/ci.yml | 2 +- active_record_encryption.gemspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0feb302..edcec42 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: strategy: matrix: gemfile: ['6.1_stable', '7.0_stable', '7.1_stable'] - ruby-version: ['3.0', '3.1', '3.2'] + ruby-version: ['3.1', '3.2'] services: mysql: image: mysql:5.7 diff --git a/active_record_encryption.gemspec b/active_record_encryption.gemspec index 0a65ab4..58cd7df 100644 --- a/active_record_encryption.gemspec +++ b/active_record_encryption.gemspec @@ -16,7 +16,7 @@ Gem::Specification.new do |spec| spec.license = 'MIT' spec.require_paths = ['lib'] - spec.required_ruby_version = '>= 3.0.0' + spec.required_ruby_version = '>= 3.1.0' spec.files = %w[ CHANGELOG.md From 41aa22dae2691dbd5a085beb75a98937f6e2aaab Mon Sep 17 00:00:00 2001 From: alpaca-tc Date: Tue, 13 Aug 2024 22:24:48 +0900 Subject: [PATCH 2/4] Add Ruby 3.3 for CI --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index edcec42..99f9038 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: strategy: matrix: gemfile: ['6.1_stable', '7.0_stable', '7.1_stable'] - ruby-version: ['3.1', '3.2'] + ruby-version: ['3.1', '3.2', '3.3'] services: mysql: image: mysql:5.7 From 87a4af40112f962a47f933c2981de029f5d79f06 Mon Sep 17 00:00:00 2001 From: alpaca-tc Date: Tue, 13 Aug 2024 22:45:13 +0900 Subject: [PATCH 3/4] Update actions/checkout v3 -> v4 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 99f9038..37224ca 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: ruby-version: ['3.1'] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Ruby uses: ruby/setup-ruby@v1 with: @@ -44,7 +44,7 @@ jobs: BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile ACTIVERECORD_ENCRYPTION_PASSWORD: 'password' steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Ruby uses: ruby/setup-ruby@v1 with: From 4f6582c8ea27ae0c85bb5c8f953cd732638ea0b6 Mon Sep 17 00:00:00 2001 From: alpaca-tc Date: Tue, 13 Aug 2024 22:46:05 +0900 Subject: [PATCH 4/4] Add version lock to sqlite3 Does not work with sqlite3 v2 in older Rails --- Appraisals | 3 +++ gemfiles/6.1_stable.gemfile | 1 + gemfiles/7.0_stable.gemfile | 1 + gemfiles/7.1_stable.gemfile | 1 + 4 files changed, 6 insertions(+) diff --git a/Appraisals b/Appraisals index bd9efd6..c1f4199 100644 --- a/Appraisals +++ b/Appraisals @@ -2,12 +2,15 @@ appraise '6.1-stable' do gem 'activerecord', '~> 6.1.0' + gem 'sqlite3', '~> 1.7.0' end appraise '7.0-stable' do gem 'activerecord', '~> 7.0.0' + gem 'sqlite3', '~> 1.7.0' end appraise '7.1-stable' do gem 'activerecord', '~> 7.1.0' + gem 'sqlite3', '~> 1.7.0' end diff --git a/gemfiles/6.1_stable.gemfile b/gemfiles/6.1_stable.gemfile index 07548db..9f0d5e3 100644 --- a/gemfiles/6.1_stable.gemfile +++ b/gemfiles/6.1_stable.gemfile @@ -3,5 +3,6 @@ source "https://rubygems.org" gem "activerecord", "~> 6.1.0" +gem "sqlite3", "~> 1.7.0" gemspec path: "../" diff --git a/gemfiles/7.0_stable.gemfile b/gemfiles/7.0_stable.gemfile index bc1dfc9..2050b0c 100644 --- a/gemfiles/7.0_stable.gemfile +++ b/gemfiles/7.0_stable.gemfile @@ -3,5 +3,6 @@ source "https://rubygems.org" gem "activerecord", "~> 7.0.0" +gem "sqlite3", "~> 1.7.0" gemspec path: "../" diff --git a/gemfiles/7.1_stable.gemfile b/gemfiles/7.1_stable.gemfile index 69bc38a..d790264 100644 --- a/gemfiles/7.1_stable.gemfile +++ b/gemfiles/7.1_stable.gemfile @@ -3,5 +3,6 @@ source "https://rubygems.org" gem "activerecord", "~> 7.1.0" +gem "sqlite3", "~> 1.7.0" gemspec path: "../"