From 37de37505bd2240a5d17747f8e6b698139e62722 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 31 Jul 2024 07:38:45 +0000 Subject: [PATCH 1/4] Update sqlite3 requirement from ~> 1.4 to ~> 2.0 Updates the requirements on [sqlite3](https://github.com/sparklemotion/sqlite3-ruby) to permit the latest version. - [Release notes](https://github.com/sparklemotion/sqlite3-ruby/releases) - [Changelog](https://github.com/sparklemotion/sqlite3-ruby/blob/main/CHANGELOG.md) - [Commits](https://github.com/sparklemotion/sqlite3-ruby/compare/v1.4.0...v2.0.3) --- updated-dependencies: - dependency-name: sqlite3 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- gemfiles/base.gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gemfiles/base.gemfile b/gemfiles/base.gemfile index b6c490e8..d5fef2c0 100644 --- a/gemfiles/base.gemfile +++ b/gemfiles/base.gemfile @@ -7,6 +7,6 @@ gem 'rspec', '>= 3.7.0' gem 'rspec-collection_matchers' gem 'rspec-its' gem 'rubocop', '1.65.0' -gem 'sqlite3', '~> 1.4' +gem 'sqlite3', '~> 2.0' gem 'timecop' gem 'unparser' From 6536532fd453d96b7de48ed2594038b03f294e58 Mon Sep 17 00:00:00 2001 From: Ilya Denisov Date: Fri, 2 Aug 2024 15:37:38 +0300 Subject: [PATCH 2/4] Add rails 7.2 to the matrix (along with sqlite3 2.x) --- .github/workflows/ruby.yml | 2 +- gemfiles/base.gemfile | 2 +- gemfiles/rails.6.1.activerecord.gemfile | 1 + gemfiles/rails.7.0.activerecord.gemfile | 1 + gemfiles/rails.7.1.activerecord.gemfile | 1 + gemfiles/rails.7.2.activerecord.gemfile | 15 +++++++++++++++ 6 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 gemfiles/rails.7.2.activerecord.gemfile diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index 825a8d4a..f9ec1e5b 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -17,7 +17,7 @@ jobs: fail-fast: false matrix: ruby: [ '3.0', '3.1', '3.2' ] - gemfile: [rails.6.1.activerecord, rails.7.0.activerecord, rails.7.1.activerecord] + gemfile: [rails.6.1.activerecord, rails.7.0.activerecord, rails.7.1.activerecord, rails.7.2.activerecord] name: ${{ matrix.ruby }}-${{ matrix.gemfile }} env: diff --git a/gemfiles/base.gemfile b/gemfiles/base.gemfile index d5fef2c0..8cf40913 100644 --- a/gemfiles/base.gemfile +++ b/gemfiles/base.gemfile @@ -7,6 +7,6 @@ gem 'rspec', '>= 3.7.0' gem 'rspec-collection_matchers' gem 'rspec-its' gem 'rubocop', '1.65.0' -gem 'sqlite3', '~> 2.0' +# gem 'sqlite3' it is specified rails-version-specific gemfiles gem 'timecop' gem 'unparser' diff --git a/gemfiles/rails.6.1.activerecord.gemfile b/gemfiles/rails.6.1.activerecord.gemfile index 526db972..02bf0d1e 100644 --- a/gemfiles/rails.6.1.activerecord.gemfile +++ b/gemfiles/rails.6.1.activerecord.gemfile @@ -7,6 +7,7 @@ gem 'kaminari-core', '~> 1.1.0', require: false gem 'parallel', require: false gem 'rspec_junit_formatter', '~> 0.4.1' gem 'sidekiq', require: false +gem 'sqlite3', '~> 1.4', '< 2.0' gem 'rexml' diff --git a/gemfiles/rails.7.0.activerecord.gemfile b/gemfiles/rails.7.0.activerecord.gemfile index 1176622a..c899b2c4 100644 --- a/gemfiles/rails.7.0.activerecord.gemfile +++ b/gemfiles/rails.7.0.activerecord.gemfile @@ -7,6 +7,7 @@ gem 'kaminari-core', '~> 1.1.0', require: false gem 'parallel', require: false gem 'rspec_junit_formatter', '~> 0.4.1' gem 'sidekiq', require: false +gem 'sqlite3', '~> 1.4', '< 2.0' gem 'rexml' diff --git a/gemfiles/rails.7.1.activerecord.gemfile b/gemfiles/rails.7.1.activerecord.gemfile index eb39c6ee..747e05d0 100644 --- a/gemfiles/rails.7.1.activerecord.gemfile +++ b/gemfiles/rails.7.1.activerecord.gemfile @@ -7,6 +7,7 @@ gem 'kaminari-core', '~> 1.1.0', require: false gem 'parallel', require: false gem 'rspec_junit_formatter', '~> 0.4.1' gem 'sidekiq', require: false +gem 'sqlite3', '~> 1.4', '< 2.0' gem 'rexml' diff --git a/gemfiles/rails.7.2.activerecord.gemfile b/gemfiles/rails.7.2.activerecord.gemfile new file mode 100644 index 00000000..233b9f2e --- /dev/null +++ b/gemfiles/rails.7.2.activerecord.gemfile @@ -0,0 +1,15 @@ +source 'https://rubygems.org' + +gem 'activejob', '~> 7.2.0' +gem 'activerecord', '~> 7.2.0' +gem 'activesupport', '~> 7.2.0' +gem 'kaminari-core', '~> 1.1.0', require: false +gem 'parallel', require: false +gem 'rspec_junit_formatter', '~> 0.4.1' +gem 'sidekiq', require: false +gem 'sqlite3', '~> 2.0' + +gem 'rexml' + +gemspec path: '../' +eval_gemfile 'base.gemfile' From ecea1db389788807822ba6d166d3aaf8a7ae284d Mon Sep 17 00:00:00 2001 From: Ilya Denisov Date: Fri, 2 Aug 2024 15:42:37 +0300 Subject: [PATCH 3/4] WIP --- .github/workflows/ruby.yml | 6 +++++- ...verecord.gemfile => rails.7.2.beta.activerecord.gemfile} | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) rename gemfiles/{rails.7.2.activerecord.gemfile => rails.7.2.beta.activerecord.gemfile} (71%) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index f9ec1e5b..ab327192 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -17,7 +17,11 @@ jobs: fail-fast: false matrix: ruby: [ '3.0', '3.1', '3.2' ] - gemfile: [rails.6.1.activerecord, rails.7.0.activerecord, rails.7.1.activerecord, rails.7.2.activerecord] + gemfile: + - rails.6.1.activerecord + - rails.7.0.activerecord + - rails.7.1.activerecord + - rails.7.2.beta.activerecord name: ${{ matrix.ruby }}-${{ matrix.gemfile }} env: diff --git a/gemfiles/rails.7.2.activerecord.gemfile b/gemfiles/rails.7.2.beta.activerecord.gemfile similarity index 71% rename from gemfiles/rails.7.2.activerecord.gemfile rename to gemfiles/rails.7.2.beta.activerecord.gemfile index 233b9f2e..e48b82f2 100644 --- a/gemfiles/rails.7.2.activerecord.gemfile +++ b/gemfiles/rails.7.2.beta.activerecord.gemfile @@ -1,8 +1,8 @@ source 'https://rubygems.org' -gem 'activejob', '~> 7.2.0' -gem 'activerecord', '~> 7.2.0' -gem 'activesupport', '~> 7.2.0' +gem 'activejob', '~> 7.2.0.beta' +gem 'activerecord', '~> 7.2.0.beta' +gem 'activesupport', '~> 7.2.0.beta' gem 'kaminari-core', '~> 1.1.0', require: false gem 'parallel', require: false gem 'rspec_junit_formatter', '~> 0.4.1' From 7a0e769dd256f1364fa64f595336183bc9fe963a Mon Sep 17 00:00:00 2001 From: Ilya Denisov Date: Fri, 2 Aug 2024 15:45:17 +0300 Subject: [PATCH 4/4] WIP --- .github/workflows/ruby.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index ab327192..ce4e72e2 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -22,6 +22,9 @@ jobs: - rails.7.0.activerecord - rails.7.1.activerecord - rails.7.2.beta.activerecord + exclude: + - ruby: 3.0 + gemfile: rails.7.2.beta.activerecord name: ${{ matrix.ruby }}-${{ matrix.gemfile }} env: