[前][次][番号順一覧][スレッド一覧]

ruby-changes:68363

From: David <ko1@a...>
Date: Mon, 11 Oct 2021 00:24:07 +0900 (JST)
Subject: [ruby-changes:68363] 9072228a26 (master): [ruby/rubygems] Get specs green on arm64-darwin-20

https://git.ruby-lang.org/ruby.git/commit/?id=9072228a26

From 9072228a26d0b737c6b9ca2f7a3e7dd7d41bb4ea Mon Sep 17 00:00:00 2001
From: David Rodriguez <deivid.rodriguez@r...>
Date: Sat, 9 Oct 2021 12:12:13 +0200
Subject: [ruby/rubygems] Get specs green on arm64-darwin-20

https://github.com/rubygems/rubygems/commit/7a0bd9801d
---
 spec/bundler/bundler/definition_spec.rb | 3 +--
 spec/bundler/lock/lockfile_spec.rb      | 3 +--
 spec/bundler/runtime/platform_spec.rb   | 3 +--
 spec/bundler/support/platforms.rb       | 6 +++++-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/spec/bundler/bundler/definition_spec.rb b/spec/bundler/bundler/definition_spec.rb
index bf000c468a..728945c401 100644
--- a/spec/bundler/bundler/definition_spec.rb
+++ b/spec/bundler/bundler/definition_spec.rb
@@ -136,8 +136,7 @@ RSpec.describe Bundler::Definition do https://github.com/ruby/ruby/blob/trunk/spec/bundler/bundler/definition_spec.rb#L136
             only_java (1.1-java)
 
         PLATFORMS
-          java
-          #{lockfile_platforms}
+          #{lockfile_platforms_for(["java"] + local_platforms)}
 
         DEPENDENCIES
           only_java
diff --git a/spec/bundler/lock/lockfile_spec.rb b/spec/bundler/lock/lockfile_spec.rb
index 0e2a3a3cd8..4e9e0f5fc3 100644
--- a/spec/bundler/lock/lockfile_spec.rb
+++ b/spec/bundler/lock/lockfile_spec.rb
@@ -984,8 +984,7 @@ RSpec.describe "the lockfile format" do https://github.com/ruby/ruby/blob/trunk/spec/bundler/lock/lockfile_spec.rb#L984
           rack (1.0.0)
 
       PLATFORMS
-        java
-        #{lockfile_platforms}
+        #{lockfile_platforms_for(["java"] + local_platforms)}
 
       DEPENDENCIES
         rack
diff --git a/spec/bundler/runtime/platform_spec.rb b/spec/bundler/runtime/platform_spec.rb
index d81bccbdf8..a89659d6ce 100644
--- a/spec/bundler/runtime/platform_spec.rb
+++ b/spec/bundler/runtime/platform_spec.rb
@@ -86,8 +86,7 @@ RSpec.describe "Bundler.setup with multi platform stuff" do https://github.com/ruby/ruby/blob/trunk/spec/bundler/runtime/platform_spec.rb#L86
           racc (1.5.2)
 
       PLATFORMS
-        ruby
-        #{Bundler.local_platform}
+        #{lockfile_platforms_for(["ruby"] + local_platforms)}
 
       DEPENDENCIES
         nokogiri (~> 1.11)
diff --git a/spec/bundler/support/platforms.rb b/spec/bundler/support/platforms.rb
index 0cb7f7cd29..07973fd727 100644
--- a/spec/bundler/support/platforms.rb
+++ b/spec/bundler/support/platforms.rb
@@ -90,7 +90,11 @@ module Spec https://github.com/ruby/ruby/blob/trunk/spec/bundler/support/platforms.rb#L90
     end
 
     def lockfile_platforms
-      local_platforms.map(&:to_s).sort.join("\n  ")
+      lockfile_platforms_for(local_platforms)
+    end
+
+    def lockfile_platforms_for(platforms)
+      platforms.map(&:to_s).sort.join("\n  ")
     end
 
     def local_platforms
-- 
cgit v1.2.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]