From 56e64bc5a2b4e8a5314d382dd0ed368dbe01b112 Mon Sep 17 00:00:00 2001 From: Michka Popoff Date: Tue, 25 Sep 2018 23:44:33 +0200 Subject: [PATCH] Revert "Revert "Use ActiveSupport Hash#deep_merge" (#111)" This reverts commit 3135c0d32a0afaa5773320de03c4a99bf1915c8d. Closes Linuxbrew/homebrew-test-bot#114. Signed-off-by: Michka Popoff --- cmd/brew-test-bot.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/brew-test-bot.rb b/cmd/brew-test-bot.rb index 1b529ef0..b2cb7566 100755 --- a/cmd/brew-test-bot.rb +++ b/cmd/brew-test-bot.rb @@ -1367,7 +1367,7 @@ def test_ci_upload(tap) json_files = Dir.glob("*.bottle.json") bottles_hash = json_files.reduce({}) do |hash, json_file| - deep_merge_hashes hash, JSON.parse(IO.read(json_file)) + hash.deep_merge(JSON.parse(IO.read(json_file))) end if ARGV.include?("--dry-run")