From 60d0af6532733eb7af285a42f8a013cd2460835d Mon Sep 17 00:00:00 2001 From: Owen Stephens Date: Wed, 6 Mar 2024 13:51:56 +0000 Subject: [PATCH 1/4] Update CI to run against Ruby 3.3 `google-protobuf` [supports Ruby 3.3 in platform-specific versions of 3.25.3](https://rubygems.org/gems/google-protobuf/versions/3.25.3-x86_64-linux) Some discussion in this thread: https://github.com/protocolbuffers/protobuf/issues/15336#issuecomment-1946383093 --- .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 428f52e..02d6159 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ jobs: strategy: fail-fast: false matrix: - ruby: ['2.6', '2.7', '3.0', '3.1', '3.2'] # 3.3+ is not yet supported by google-protobuf + ruby: ['2.6', '2.7', '3.0', '3.1', '3.2', '3.3'] # 3.4+ is not yet supported by google-protobuf os: ['ubuntu-latest', 'windows-latest'] runs-on: ${{ matrix.os }} steps: From d5b14334285bafd8f962263a7aeb43c027870341 Mon Sep 17 00:00:00 2001 From: Owen Stephens Date: Thu, 7 Mar 2024 10:29:48 +0000 Subject: [PATCH 2/4] fixup! Update CI to run against Ruby 3.3 --- Gemfile.lock | 4 ++-- pg_query.gemspec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b649509..8a3517f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,7 +2,7 @@ PATH remote: . specs: pg_query (5.1.0) - google-protobuf (>= 3.22.3) + google-protobuf (>= 3.25.3) GEM remote: https://rubygems.org/ @@ -10,7 +10,7 @@ GEM ast (2.4.1) diff-lcs (1.5.0) docile (1.4.0) - google-protobuf (3.23.4) + google-protobuf (3.25.3) parallel (1.20.1) parser (2.7.2.0) ast (~> 2.4.1) diff --git a/pg_query.gemspec b/pg_query.gemspec index dcb8126..4330650 100644 --- a/pg_query.gemspec +++ b/pg_query.gemspec @@ -26,5 +26,5 @@ Gem::Specification.new do |s| s.add_development_dependency 'rubocop', '0.49.1' s.add_development_dependency 'rubocop-rspec', '1.15.1' s.add_development_dependency 'simplecov', '~> 0' - s.add_dependency 'google-protobuf', '>= 3.22.3' + s.add_dependency 'google-protobuf', '>= 3.25.3' end From b65b7b63200a8470ce81cb247c8684413d863ceb Mon Sep 17 00:00:00 2001 From: Owen Stephens Date: Thu, 7 Mar 2024 23:00:10 +0000 Subject: [PATCH 3/4] fixup! fixup! Update CI to run against Ruby 3.3 --- .github/workflows/ci.yml | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 02d6159..22a7b4d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ jobs: strategy: fail-fast: false matrix: - ruby: ['2.6', '2.7', '3.0', '3.1', '3.2', '3.3'] # 3.4+ is not yet supported by google-protobuf + ruby: ['2.7', '3.0', '3.1', '3.2', '3.3'] # 3.4+ is not yet supported by google-protobuf os: ['ubuntu-latest', 'windows-latest'] runs-on: ${{ matrix.os }} steps: diff --git a/README.md b/README.md index 3e9a416..2cb59d5 100644 --- a/README.md +++ b/README.md @@ -178,11 +178,11 @@ not correctly handle all CTEs, or rewrite columns with explicit table names. Currently tested and officially supported Ruby versions: -* CRuby 2.6 * CRuby 2.7 * CRuby 3.0 * CRuby 3.1 * CRuby 3.2 +* CRuby 3.3 Not supported: From 94feb8e688e7fb953254a56ce78b57541acb464d Mon Sep 17 00:00:00 2001 From: Owen Stephens Date: Thu, 7 Mar 2024 23:06:50 +0000 Subject: [PATCH 4/4] fixup! fixup! fixup! Update CI to run against Ruby 3.3 --- .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 22a7b4d..d1d901d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,4 +21,4 @@ jobs: run: bundle exec rake test - name: RuboCop run: bundle exec rake lint - if: matrix.ruby != '3.1' && matrix.ruby != '3.2' + if: matrix.ruby != '3.1' && matrix.ruby != '3.2' && matrix.ruby != '3.3'