From 4d1c369b1ea960070f9fc225aaf2e11c2b75f7b3 Mon Sep 17 00:00:00 2001
From: Tom Hu <tomhu1096@gmail.com>
Date: Thu, 4 Feb 2021 09:02:39 +0000
Subject: [PATCH] Add Codecov GitHub Action step

---
 .github/workflows/tests.yml                     | 3 ++-
 Library/Homebrew/Gemfile                        | 1 -
 Library/Homebrew/Gemfile.lock                   | 3 ---
 Library/Homebrew/test/spec_helper.rb            | 8 +++-----
 Library/Homebrew/vendor/bundle/bundler/setup.rb | 1 -
 5 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 29c9a57250..6e586b255b 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -164,7 +164,8 @@ jobs:
           brew tests ${{ matrix.test-flags }}
         env:
           HOMEBREW_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          HOMEBREW_CODECOV_TOKEN: 3ea0364c-80ce-47a3-9fba-93a940d4b5d7
+
+      - uses: codecov/codecov-action@v1
 
   test-default-formula-linux:
     name: test default formula (Linux)
diff --git a/Library/Homebrew/Gemfile b/Library/Homebrew/Gemfile
index f13e5f3bbf..d76ebf5fa8 100644
--- a/Library/Homebrew/Gemfile
+++ b/Library/Homebrew/Gemfile
@@ -5,7 +5,6 @@ source "https://rubygems.org"
 # installed gems (should all be require: false)
 gem "bootsnap", require: false
 gem "byebug", require: false
-gem "codecov", require: false
 gem "nokogiri", require: false
 gem "parallel_tests", require: false
 gem "ronn", require: false
diff --git a/Library/Homebrew/Gemfile.lock b/Library/Homebrew/Gemfile.lock
index 21073312a0..a0d62d2ce9 100644
--- a/Library/Homebrew/Gemfile.lock
+++ b/Library/Homebrew/Gemfile.lock
@@ -12,8 +12,6 @@ GEM
     bootsnap (1.7.0)
       msgpack (~> 1.0)
     byebug (11.1.3)
-    codecov (0.4.2)
-      simplecov (>= 0.15, < 0.22)
     coderay (1.1.3)
     colorize (0.8.1)
     commander (4.5.2)
@@ -174,7 +172,6 @@ DEPENDENCIES
   activesupport
   bootsnap
   byebug
-  codecov
   concurrent-ruby
   mechanize
   nokogiri
diff --git a/Library/Homebrew/test/spec_helper.rb b/Library/Homebrew/test/spec_helper.rb
index 7b7b3bfe3c..5726204417 100644
--- a/Library/Homebrew/test/spec_helper.rb
+++ b/Library/Homebrew/test/spec_helper.rb
@@ -5,10 +5,10 @@ if ENV["HOMEBREW_TESTS_COVERAGE"]
   require "simplecov"
 
   formatters = [SimpleCov::Formatter::HTMLFormatter]
-  if ENV["HOMEBREW_CODECOV_TOKEN"] && RUBY_PLATFORM[/darwin/]
-    require "codecov"
+  if RUBY_PLATFORM[/darwin/]
+    require "simplecov_json_formatter"
 
-    formatters << SimpleCov::Formatter::Codecov
+    formatters << SimpleCov::Formatter::JSONFormatter
 
     if ENV["TEST_ENV_NUMBER"]
       SimpleCov.at_exit do
@@ -16,8 +16,6 @@ if ENV["HOMEBREW_TESTS_COVERAGE"]
         result.format! if ParallelTests.number_of_running_processes <= 1
       end
     end
-
-    ENV["CODECOV_TOKEN"] = ENV["HOMEBREW_CODECOV_TOKEN"]
   end
 
   SimpleCov.formatters = SimpleCov::Formatter::MultiFormatter.new(formatters)
diff --git a/Library/Homebrew/vendor/bundle/bundler/setup.rb b/Library/Homebrew/vendor/bundle/bundler/setup.rb
index e7244827b6..ca5e3a15c0 100644
--- a/Library/Homebrew/vendor/bundle/bundler/setup.rb
+++ b/Library/Homebrew/vendor/bundle/bundler/setup.rb
@@ -22,7 +22,6 @@ $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/docile-1.3.5/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/simplecov-html-0.12.3/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/simplecov_json_formatter-0.1.2/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/simplecov-0.21.2/lib"
-$:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/codecov-0.4.2/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/coderay-1.1.3/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/colorize-0.8.1/lib"
 $:.unshift "#{path}/../#{ruby_engine}/#{ruby_version}/gems/highline-2.0.3/lib"