Skip to content

Commit

Permalink
Upgrade to Ruby 3.3.6 everywhere
Browse files Browse the repository at this point in the history
And use a version of the parser gem fully compatible with it.

Co-authored-by: Chris Yuska <[email protected]>
  • Loading branch information
2 people authored and randhircs committed Dec 19, 2024
1 parent 0ca97d4 commit ed8b3dc
Show file tree
Hide file tree
Showing 10 changed files with 43 additions and 42 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"ghcr.io/devcontainers/features/github-cli": "latest",
"ghcr.io/devcontainers/features/node": "lts",
"ghcr.io/devcontainers/features/go": "latest",
"ghcr.io/devcontainers/features/ruby": "3.3.5",
"ghcr.io/devcontainers/features/ruby": "3.3.6",
"ghcr.io/devcontainers/features/rust": "latest",
"ghcr.io/devcontainers/features/dotnet": "latest",
"ghcr.io/devcontainers/features/sshd:1": {
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.3.5
3.3.6
2 changes: 1 addition & 1 deletion Dockerfile.updater-core
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ COPY --chown=dependabot:dependabot LICENSE $DEPENDABOT_HOME

# Install Ruby from official Docker image
# When bumping Ruby minor, need to also add the previous version to `bundler/helpers/v2/monkey_patches/definition_ruby_version_patch.rb`
COPY --from=docker.io/library/ruby:3.3.5-bookworm --chown=dependabot:dependabot /usr/local /usr/local
COPY --from=docker.io/library/ruby:3.3.6-bookworm --chown=dependabot:dependabot /usr/local /usr/local

# We had to explicitly bump this as the bundled version `0.2.2` in ubuntu 22.04 has a bug.
# Once Ubuntu base image pulls in a new enough yaml version, we may not need to
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -238,14 +238,14 @@ GEM
parallel_tests (4.4.0)
parallel
parseconfig (1.0.8)
parser (3.3.1.0)
parser (3.3.6.0)
ast (~> 2.4.1)
racc
prism (1.2.0)
psych (5.1.2)
stringio
public_suffix (5.0.4)
racc (1.7.3)
racc (1.8.1)
rainbow (3.1.1)
rake (13.1.0)
rbi (0.2.1)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class RubyRequirementSetter
class RubyVersionNotFound < StandardError; end

RUBY_VERSIONS = %w(
1.8.7 1.9.3 2.0.0 2.1.10 2.2.10 2.3.8 2.4.10 2.5.9 2.6.9 2.7.6 3.0.6 3.1.6 3.2.4 3.3.5
1.8.7 1.9.3 2.0.0 2.1.10 2.2.10 2.3.8 2.4.10 2.5.9 2.6.9 2.7.6 3.0.6 3.1.6 3.2.4 3.3.6
).freeze

attr_reader :gemspec
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
bundler_project_dependency_file("gemfile", filename: "Gemfile").content
end

it { is_expected.to include("ruby '3.3.5'\n") }
it { is_expected.to include("ruby '3.3.6'\n") }
it { is_expected.to include(%(gem "business", "~> 1.4.0")) }
end

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
spec.files = Dir["CHANGELOG.md", "LICENSE.txt", "README.md",
"lib/**/*", "helpers/**/*"]

spec.required_ruby_version = ">= 3.3.5"
spec.required_ruby_version = ">= 3.3.6"
spec.required_rubygems_version = ">= 3.5.3"

spec.add_dependency 'business', '~> 1.0'
Expand Down
File renamed without changes.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion updater/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ GEM
parallel_tests (4.7.1)
parallel
parseconfig (1.0.8)
parser (3.3.5.0)
parser (3.3.6.0)
ast (~> 2.4.1)
racc
psych (5.1.2)
Expand Down

0 comments on commit ed8b3dc

Please sign in to comment.