From 0ed582f9f81a65a90d9b6e77c54864ea1f22f665 Mon Sep 17 00:00:00 2001 From: Ilya Bylich Date: Sat, 4 Jan 2025 19:20:07 +0100 Subject: [PATCH] Revert "* bump 3.4 branch, remove 3.0 from CI (EOL) (#1057)" This reverts commit 3d89cb4096d45d6c2800ccb7e21c13bfe269c68a. --- .github/workflows/test.yml | 6 +++--- lib/parser/current.rb | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 70c1e8c8c..eb0cd1075 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,16 +17,16 @@ jobs: strategy: fail-fast: false matrix: - ruby: ["3.1.6", "3.2.6", "3.3.6", "3.4.1", "jruby-9.2"] + ruby: ["3.0.7", "3.1.6", "3.2.6", "3.3.6", "jruby-9.2"] test_command: ["bundle exec rake test"] include: - ruby: "head" test_command: "bundle exec rake test || true" - ruby: "truffleruby" test_command: "bundle exec rake test || true" - - ruby: "3.3.6" + - ruby: "3.2.6" test_command: "./ci/run_rubocop_specs || true" - - ruby: "3.4.1" + - ruby: "3.3.6" test_command: "./ci/run_rubocop_specs || true" steps: - uses: actions/checkout@v4 diff --git a/lib/parser/current.rb b/lib/parser/current.rb index 6e63f3cd9..24e4cf449 100644 --- a/lib/parser/current.rb +++ b/lib/parser/current.rb @@ -120,7 +120,7 @@ def warn_syntax_deviation(feature, version) CurrentRuby = Ruby33 when /^3\.4\./ - current_version = '3.4.1' + current_version = '3.4.0' if RUBY_VERSION != current_version warn_syntax_deviation 'parser/ruby34', current_version end @@ -130,8 +130,8 @@ def warn_syntax_deviation(feature, version) else # :nocov: # Keep this in sync with released Ruby. - warn_syntax_deviation 'parser/ruby34', '3.4.x' - require_relative 'ruby34' - CurrentRuby = Ruby34 + warn_syntax_deviation 'parser/ruby33', '3.3.x' + require_relative 'ruby33' + CurrentRuby = Ruby33 end end