ruby-changes:71164
From: nagachika <ko1@a...>
Date: Sat, 12 Feb 2022 17:27:52 +0900 (JST)
Subject: [ruby-changes:71164] 034872d6a6 (ruby_3_0): merge revision(s) 342e7a094a70d6f90b96262c88177dae32976c85:
https://git.ruby-lang.org/ruby.git/commit/?id=034872d6a6 From 034872d6a66916fb2859f41d380ce503c84a65e8 Mon Sep 17 00:00:00 2001 From: nagachika <nagachika@r...> Date: Sat, 12 Feb 2022 16:52:38 +0900 Subject: merge revision(s) 342e7a094a70d6f90b96262c88177dae32976c85: [rubygems/rubygems] Fix spec to not touch the network And not depend on the state of rack's master branch, in particular, on their Ruby support range. https://github.com/rubygems/rubygems/commit/9ea4baffac --- spec/bundler/commands/remove_spec.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- spec/bundler/commands/remove_spec.rb | 4 +++- version.h | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/spec/bundler/commands/remove_spec.rb b/spec/bundler/commands/remove_spec.rb index 70dc09c9b6..95d6e75e9f 100644 --- a/spec/bundler/commands/remove_spec.rb +++ b/spec/bundler/commands/remove_spec.rb @@ -48,12 +48,14 @@ RSpec.describe "bundle remove" do https://github.com/ruby/ruby/blob/trunk/spec/bundler/commands/remove_spec.rb#L48 context "when gem is specified in multiple lines" do it "shows success for removed gem" do + build_git "rack" + gemfile <<-G source '#{file_uri_for(gem_repo1)}' gem 'git' gem 'rack', - git: 'https://github.com/rack/rack', + git: "#{lib_path("rack-1.0")}", branch: 'master' gem 'nokogiri' G diff --git a/version.h b/version.h index 3223f4b72f..f74699f971 100644 --- a/version.h +++ b/version.h @@ -12,11 +12,11 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L12 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 4 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 164 +#define RUBY_PATCHLEVEL 165 -#define RUBY_RELEASE_YEAR 2021 -#define RUBY_RELEASE_MONTH 12 -#define RUBY_RELEASE_DAY 24 +#define RUBY_RELEASE_YEAR 2022 +#define RUBY_RELEASE_MONTH 2 +#define RUBY_RELEASE_DAY 12 #include "ruby/version.h" -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/