From 1fb58d5b2f6f0c565f825159619266653be9a6cf Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Wed, 3 Feb 2021 22:32:37 -0500 Subject: [PATCH 01/19] 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" From 4d1c369b1ea960070f9fc225aaf2e11c2b75f7b3 Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Thu, 4 Feb 2021 09:02:39 +0000 Subject: [PATCH 02/19] 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" From 1b2dab5efa54d184cb7185dc2b16383192e20e78 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Thu, 4 Feb 2021 09:06:06 +0000 Subject: [PATCH 03/19] Remove more codecov gem references. --- .gitignore | 1 - .../sorbet/rbi/gems/codecov@0.4.2.rbi | 8 -- .../sorbet/rbi/hidden-definitions/hidden.rbi | 81 ------------------- 3 files changed, 90 deletions(-) delete mode 100644 Library/Homebrew/sorbet/rbi/gems/codecov@0.4.2.rbi diff --git a/.gitignore b/.gitignore index 1336c48acd..f89b0e524a 100644 --- a/.gitignore +++ b/.gitignore @@ -92,7 +92,6 @@ **/vendor/bundle/ruby/*/gems/colorize-*/ **/vendor/bundle/ruby/*/gems/commander-*/ **/vendor/bundle/ruby/*/gems/connection_pool-*/ -**/vendor/bundle/ruby/*/gems/codecov-*/ **/vendor/bundle/ruby/*/gems/diff-lcs-*/ **/vendor/bundle/ruby/*/gems/docile-*/ **/vendor/bundle/ruby/*/gems/domain_name-*/ diff --git a/Library/Homebrew/sorbet/rbi/gems/codecov@0.4.2.rbi b/Library/Homebrew/sorbet/rbi/gems/codecov@0.4.2.rbi deleted file mode 100644 index a33dc8c1df..0000000000 --- a/Library/Homebrew/sorbet/rbi/gems/codecov@0.4.2.rbi +++ /dev/null @@ -1,8 +0,0 @@ -# DO NOT EDIT MANUALLY -# This is an autogenerated file for types exported from the `codecov` gem. -# Please instead update this file by running `tapioca sync`. - -# typed: true - -# THIS IS AN EMPTY RBI FILE. -# see https://github.com/Shopify/tapioca/blob/master/README.md#manual-gem-requires diff --git a/Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi b/Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi index 0742430cb8..c712de39b0 100644 --- a/Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi +++ b/Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi @@ -6105,80 +6105,6 @@ module CodeRay def self.scanner(lang, options=T.unsafe(nil), &block); end end -module Codecov - VERSION = ::T.let(nil, ::T.untyped) -end - -module Codecov::SimpleCov -end - -class Codecov::SimpleCov::Formatter - def format(report); end - RESULT_FILE_NAME = ::T.let(nil, ::T.untyped) -end - -class Codecov::SimpleCov::Formatter -end - -module Codecov::SimpleCov -end - -class Codecov::Uploader - APPVEYOR = ::T.let(nil, ::T.untyped) - AZUREPIPELINES = ::T.let(nil, ::T.untyped) - BITBUCKET = ::T.let(nil, ::T.untyped) - BITRISE = ::T.let(nil, ::T.untyped) - BUILDKITE = ::T.let(nil, ::T.untyped) - CIRCLE = ::T.let(nil, ::T.untyped) - CODEBUILD = ::T.let(nil, ::T.untyped) - CODESHIP = ::T.let(nil, ::T.untyped) - DRONEIO = ::T.let(nil, ::T.untyped) - GITHUB = ::T.let(nil, ::T.untyped) - GITLAB = ::T.let(nil, ::T.untyped) - HEROKU = ::T.let(nil, ::T.untyped) - JENKINS = ::T.let(nil, ::T.untyped) - RECOGNIZED_CIS = ::T.let(nil, ::T.untyped) - SEMAPHORE = ::T.let(nil, ::T.untyped) - SHIPPABLE = ::T.let(nil, ::T.untyped) - SOLANO = ::T.let(nil, ::T.untyped) - TEAMCITY = ::T.let(nil, ::T.untyped) - TRAVIS = ::T.let(nil, ::T.untyped) - WERCKER = ::T.let(nil, ::T.untyped) -end - -class Codecov::Uploader - def self.black(str); end - - def self.build_params(ci); end - - def self.detect_ci(); end - - def self.display_header(); end - - def self.green(str); end - - def self.gzip_report(report); end - - def self.handle_report_response(report); end - - def self.net_blockers(switch); end - - def self.red(str); end - - def self.retry_request(req, https); end - - def self.upload(report, disable_net_blockers=T.unsafe(nil)); end - - def self.upload_to_codecov(ci, report); end - - def self.upload_to_v2(url, report, query, query_without_token); end - - def self.upload_to_v4(url, report, query, query_without_token); end -end - -module Codecov -end - class CompilerSelector::Compiler def self.[](*_); end @@ -28306,13 +28232,6 @@ end module SimpleCov::Formatter end -class SimpleCov::Formatter::Codecov - def format(result, disable_net_blockers=T.unsafe(nil)); end -end - -class SimpleCov::Formatter::Codecov -end - class SimpleCov::Formatter::HTMLFormatter def branchable_result?(); end From 44fae4588958cefaaa21f80679d5ea11e2b32c62 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Thu, 4 Feb 2021 09:06:17 +0000 Subject: [PATCH 04/19] workflows/tests: more codecov cleanup. --- .github/workflows/tests.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6e586b255b..81548ebb8c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -165,7 +165,7 @@ jobs: env: HOMEBREW_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - uses: codecov/codecov-action@v1 + - uses: codecov/codecov-action@e156083f13aff6830c92fc5faa23505779fbf649 # v1.2.1 test-default-formula-linux: name: test default formula (Linux) @@ -261,8 +261,6 @@ jobs: run: brew tests --online --coverage env: HOMEBREW_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # Set variables for coverage reporting. - HOMEBREW_CODECOV_TOKEN: 3ea0364c-80ce-47a3-9fba-93a940d4b5d7 # These cannot be queried at the macOS level on GitHub Actions. HOMEBREW_LANGUAGES: en-GB From d02edd74121e46d5a0f2c0f75eb2593bf0cef5ad Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Thu, 4 Feb 2021 10:55:31 -0500 Subject: [PATCH 05/19] Search in Homebrew directory for coverage --- .github/workflows/tests.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 81548ebb8c..6ac9a83b3a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -166,6 +166,8 @@ jobs: HOMEBREW_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} - uses: codecov/codecov-action@e156083f13aff6830c92fc5faa23505779fbf649 # v1.2.1 + with: + directory: /home/linuxbrew/.linuxbrew/Homebrew test-default-formula-linux: name: test default formula (Linux) From b0ec7e94f75ee077b4377c1840352a8774061ec9 Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Thu, 4 Feb 2021 11:57:11 -0500 Subject: [PATCH 06/19] Test for coverage existence --- .github/workflows/tests.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6ac9a83b3a..e55bfa5c12 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -165,9 +165,12 @@ jobs: env: HOMEBREW_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Show coverage files + run: ls -al /home/linuxbrew/.linuxbrew/Homebrew/Library/Homebrew/test/coverage + - uses: codecov/codecov-action@e156083f13aff6830c92fc5faa23505779fbf649 # v1.2.1 with: - directory: /home/linuxbrew/.linuxbrew/Homebrew + directory: /home/linuxbrew/.linuxbrew/Homebrew/Library/Homebrew/test/coverage test-default-formula-linux: name: test default formula (Linux) From 7d8437608e7ba37f7dbd0561d25210ff30c4e099 Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Thu, 4 Feb 2021 12:35:55 -0500 Subject: [PATCH 07/19] Add JSONFormatter explicitly --- Library/Homebrew/test/spec_helper.rb | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/Library/Homebrew/test/spec_helper.rb b/Library/Homebrew/test/spec_helper.rb index 5726204417..ea57b47c22 100644 --- a/Library/Homebrew/test/spec_helper.rb +++ b/Library/Homebrew/test/spec_helper.rb @@ -3,22 +3,17 @@ if ENV["HOMEBREW_TESTS_COVERAGE"] require "simplecov" + require "simplecov_json_formatter" - formatters = [SimpleCov::Formatter::HTMLFormatter] - if RUBY_PLATFORM[/darwin/] - require "simplecov_json_formatter" + formatters = [SimpleCov::Formatter::HTMLFormatter, SimpleCov::Formatter::JSONFormatter] + SimpleCov.formatters = SimpleCov::Formatter::MultiFormatter.new(formatters) - formatters << SimpleCov::Formatter::JSONFormatter - - if ENV["TEST_ENV_NUMBER"] - SimpleCov.at_exit do - result = SimpleCov.result - result.format! if ParallelTests.number_of_running_processes <= 1 - end + if RUBY_PLATFORM[/darwin/] && ENV["TEST_ENV_NUMBER"] + SimpleCov.at_exit do + result = SimpleCov.result + result.format! if ParallelTests.number_of_running_processes <= 1 end end - - SimpleCov.formatters = SimpleCov::Formatter::MultiFormatter.new(formatters) end require "rspec/its" From 91e89f41f1df49765f3488dc50146a1b0a38cb86 Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Thu, 4 Feb 2021 12:44:54 -0500 Subject: [PATCH 08/19] Update path fixing --- .github/codecov.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/codecov.yml b/.github/codecov.yml index 20c1e42d0a..87a62dadcc 100644 --- a/.github/codecov.yml +++ b/.github/codecov.yml @@ -1,5 +1,5 @@ fixes: - - "::Library/Homebrew/" + - "/home/linuxbrew/.linuxbrew/Homebrew/::" coverage: round: nearest status: From 0947ab6c299c78d969305c5443b5cdac8d4c41e3 Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Thu, 1 Apr 2021 18:59:46 -0400 Subject: [PATCH 09/19] Use simplecov-cobertura --- .github/codecov.yml | 2 +- Library/Homebrew/Gemfile | 1 + Library/Homebrew/test/spec_helper.rb | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/codecov.yml b/.github/codecov.yml index 87a62dadcc..20c1e42d0a 100644 --- a/.github/codecov.yml +++ b/.github/codecov.yml @@ -1,5 +1,5 @@ fixes: - - "/home/linuxbrew/.linuxbrew/Homebrew/::" + - "::Library/Homebrew/" coverage: round: nearest status: diff --git a/Library/Homebrew/Gemfile b/Library/Homebrew/Gemfile index 8dfd6cb0af..8542196c95 100644 --- a/Library/Homebrew/Gemfile +++ b/Library/Homebrew/Gemfile @@ -18,6 +18,7 @@ gem "rspec-wait", require: false gem "rubocop", require: false gem "rubocop-ast", require: false gem "simplecov", require: false +gem 'simplecov-cobertura', require: false gem "sorbet", require: false gem "sorbet-runtime", require: false gem "tapioca", require: false diff --git a/Library/Homebrew/test/spec_helper.rb b/Library/Homebrew/test/spec_helper.rb index bc9653df54..27e43475e8 100644 --- a/Library/Homebrew/test/spec_helper.rb +++ b/Library/Homebrew/test/spec_helper.rb @@ -3,9 +3,12 @@ if ENV["HOMEBREW_TESTS_COVERAGE"] require "simplecov" - require "simplecov_json_formatter" + require 'simplecov-cobertura' - formatters = [SimpleCov::Formatter::HTMLFormatter, SimpleCov::Formatter::JSONFormatter] + formatters = [ + SimpleCov::Formatter::HTMLFormatter, + SimpleCov::Formatter::CoberturaFormater, + ] SimpleCov.formatters = SimpleCov::Formatter::MultiFormatter.new(formatters) if RUBY_PLATFORM[/darwin/] && ENV["TEST_ENV_NUMBER"] From bba27eefec8a5bddd8ab123befa087670f128462 Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Thu, 1 Apr 2021 20:29:27 -0400 Subject: [PATCH 10/19] Use double quotes --- Library/Homebrew/Gemfile | 2 +- Library/Homebrew/test/spec_helper.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/Gemfile b/Library/Homebrew/Gemfile index 8542196c95..5c755eab6b 100644 --- a/Library/Homebrew/Gemfile +++ b/Library/Homebrew/Gemfile @@ -18,7 +18,7 @@ gem "rspec-wait", require: false gem "rubocop", require: false gem "rubocop-ast", require: false gem "simplecov", require: false -gem 'simplecov-cobertura', require: false +gem "simplecov-cobertura", require: false gem "sorbet", require: false gem "sorbet-runtime", require: false gem "tapioca", require: false diff --git a/Library/Homebrew/test/spec_helper.rb b/Library/Homebrew/test/spec_helper.rb index 27e43475e8..17be2f9634 100644 --- a/Library/Homebrew/test/spec_helper.rb +++ b/Library/Homebrew/test/spec_helper.rb @@ -3,7 +3,7 @@ if ENV["HOMEBREW_TESTS_COVERAGE"] require "simplecov" - require 'simplecov-cobertura' + require "simplecov-cobertura" formatters = [ SimpleCov::Formatter::HTMLFormatter, From ff7a0a121f951b95734682ef166b867304eb4e2f Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Thu, 1 Apr 2021 21:19:56 -0400 Subject: [PATCH 11/19] typo --- Library/Homebrew/test/spec_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/test/spec_helper.rb b/Library/Homebrew/test/spec_helper.rb index 17be2f9634..1901282169 100644 --- a/Library/Homebrew/test/spec_helper.rb +++ b/Library/Homebrew/test/spec_helper.rb @@ -7,7 +7,7 @@ if ENV["HOMEBREW_TESTS_COVERAGE"] formatters = [ SimpleCov::Formatter::HTMLFormatter, - SimpleCov::Formatter::CoberturaFormater, + SimpleCov::Formatter::CoberturaFormatter, ] SimpleCov.formatters = SimpleCov::Formatter::MultiFormatter.new(formatters) From 425be883b0ff3e0ef0783fd6e4c5832c26eee442 Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Fri, 2 Apr 2021 10:41:57 -0400 Subject: [PATCH 12/19] Update Gemfile.lock --- Library/Homebrew/Gemfile.lock | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Library/Homebrew/Gemfile.lock b/Library/Homebrew/Gemfile.lock index 81739b74bf..0ecaa46bc6 100644 --- a/Library/Homebrew/Gemfile.lock +++ b/Library/Homebrew/Gemfile.lock @@ -135,6 +135,8 @@ GEM docile (~> 1.1) simplecov-html (~> 0.11) simplecov_json_formatter (~> 0.1) + simplecov-cobertura (1.4.2) + simplecov (~> 0.8) simplecov-html (0.12.3) simplecov_json_formatter (0.1.2) sorbet (0.5.6274) @@ -196,6 +198,7 @@ DEPENDENCIES rubocop-sorbet ruby-macho simplecov + simplecov-cobertura sorbet sorbet-runtime sorbet-runtime-stub From 9f9403b753aece5347d6bc698b9c0d77725ea13d Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Fri, 2 Apr 2021 10:42:09 -0400 Subject: [PATCH 13/19] Add flags for Codecov --- .github/workflows/tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1421642658..f2cb3a5fd7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -216,6 +216,7 @@ jobs: - uses: codecov/codecov-action@e156083f13aff6830c92fc5faa23505779fbf649 # v1.2.1 with: directory: /home/linuxbrew/.linuxbrew/Homebrew/Library/Homebrew/test/coverage + flags: ${{ matrix.name }} test-default-formula-linux: name: test default formula (Linux) From a1742c6f4e0db76dbf7aac1d4b851e4fbd9e71bc Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Fri, 2 Apr 2021 15:55:45 +0100 Subject: [PATCH 14/19] Update brew typecheck data. --- ....5.1.rbi => simplecov-cobertura@1.4.2.rbi} | 2 +- .../sorbet/rbi/hidden-definitions/hidden.rbi | 190 +++++++++++++++--- 2 files changed, 159 insertions(+), 33 deletions(-) rename Library/Homebrew/sorbet/rbi/gems/{codecov@0.5.1.rbi => simplecov-cobertura@1.4.2.rbi} (70%) diff --git a/Library/Homebrew/sorbet/rbi/gems/codecov@0.5.1.rbi b/Library/Homebrew/sorbet/rbi/gems/simplecov-cobertura@1.4.2.rbi similarity index 70% rename from Library/Homebrew/sorbet/rbi/gems/codecov@0.5.1.rbi rename to Library/Homebrew/sorbet/rbi/gems/simplecov-cobertura@1.4.2.rbi index a33dc8c1df..f7adcbc881 100644 --- a/Library/Homebrew/sorbet/rbi/gems/codecov@0.5.1.rbi +++ b/Library/Homebrew/sorbet/rbi/gems/simplecov-cobertura@1.4.2.rbi @@ -1,5 +1,5 @@ # DO NOT EDIT MANUALLY -# This is an autogenerated file for types exported from the `codecov` gem. +# This is an autogenerated file for types exported from the `simplecov-cobertura` gem. # Please instead update this file by running `tapioca sync`. # typed: true diff --git a/Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi b/Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi index fcef5a6ace..dc118c3802 100644 --- a/Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi +++ b/Library/Homebrew/sorbet/rbi/hidden-definitions/hidden.rbi @@ -532,6 +532,14 @@ class ActiveSupport::CurrentAttributes def _reset_callbacks(); end def _run_reset_callbacks(&block); end + + def attributes(); end + + def attributes=(attributes); end + + def reset(); end + + def set(set_attributes); end end class ActiveSupport::CurrentAttributes @@ -553,9 +561,17 @@ class ActiveSupport::CurrentAttributes def self.before_reset(&block); end + def self.clear_all(); end + def self.instance(); end + def self.reset(*args, &block); end + + def self.reset_all(); end + def self.resets(&block); end + + def self.set(*args, &block); end end module ActiveSupport::Dependencies @@ -2814,12 +2830,99 @@ end class Bootsnap::CompileCache::Error end +module Bootsnap::CompileCache::ISeq +end + +module Bootsnap::CompileCache::ISeq::InstructionSequenceMixin + def compile_option=(hash); end + + def load_iseq(path); end +end + +module Bootsnap::CompileCache::ISeq::InstructionSequenceMixin +end + +module Bootsnap::CompileCache::ISeq + def self.cache_dir(); end + + def self.cache_dir=(cache_dir); end + + def self.compile_option_updated(); end + + def self.fetch(path, cache_dir: T.unsafe(nil)); end + + def self.input_to_output(_data, _kwargs); end + + def self.input_to_storage(_, path); end + + def self.install!(cache_dir); end + + def self.precompile(path, cache_dir: T.unsafe(nil)); end + + def self.storage_to_output(binary, _args); end +end + +module Bootsnap::CompileCache::Native +end + +module Bootsnap::CompileCache::Native + def self.compile_option_crc32=(compile_option_crc32); end + + def self.coverage_running?(); end + + def self.fetch(_, _1, _2, _3); end + + def self.precompile(_, _1, _2); end +end + class Bootsnap::CompileCache::PermissionError end class Bootsnap::CompileCache::PermissionError end +class Bootsnap::CompileCache::Uncompilable +end + +class Bootsnap::CompileCache::Uncompilable +end + +module Bootsnap::CompileCache::YAML +end + +module Bootsnap::CompileCache::YAML::Patch + def load_file(path, *args); end +end + +module Bootsnap::CompileCache::YAML::Patch +end + +module Bootsnap::CompileCache::YAML + def self.cache_dir(); end + + def self.cache_dir=(cache_dir); end + + def self.init!(); end + + def self.input_to_output(data, kwargs); end + + def self.input_to_storage(contents, _); end + + def self.install!(cache_dir); end + + def self.msgpack_factory(); end + + def self.msgpack_factory=(msgpack_factory); end + + def self.precompile(path, cache_dir: T.unsafe(nil)); end + + def self.storage_to_output(data, kwargs); end + + def self.supported_options(); end + + def self.supported_options=(supported_options); end +end + module Bootsnap::CompileCache def self.permission_error(path); end @@ -2950,6 +3053,13 @@ module Bootsnap::LoadPathCache::ChangeObserver def self.register(observer, arr); end end +module Bootsnap::LoadPathCache::CoreExt +end + +module Bootsnap::LoadPathCache::CoreExt + def self.make_load_error(path); end +end + class Bootsnap::LoadPathCache::FallbackScan end @@ -5574,6 +5684,15 @@ module Cask::Caskroom extend ::T::Private::Methods::SingletonMethodHooks end +class Cask::Cmd::AbstractCommand + include ::Homebrew::Search::Extension +end + +class Cask::Cmd::AbstractCommand + extend ::T::Private::Methods::MethodHooks + extend ::T::Private::Methods::SingletonMethodHooks +end + class Cask::Config def appdir(); end @@ -6947,8 +7066,6 @@ end class Errno::EBADRPC end -Errno::ECAPMODE = Errno::NOERROR - Errno::EDEADLOCK = Errno::NOERROR class Errno::EDEVERR @@ -6969,13 +7086,6 @@ end Errno::EIPSEC = Errno::NOERROR -class Errno::ELAST - Errno = ::T.let(nil, ::T.untyped) -end - -class Errno::ELAST -end - class Errno::ENEEDAUTH Errno = ::T.let(nil, ::T.untyped) end @@ -6997,8 +7107,6 @@ end class Errno::ENOPOLICY end -Errno::ENOTCAPABLE = Errno::NOERROR - class Errno::ENOTSUP Errno = ::T.let(nil, ::T.untyped) end @@ -7041,7 +7149,12 @@ end class Errno::EPWROFF end -Errno::EQFULL = Errno::ELAST +class Errno::EQFULL + Errno = ::T.let(nil, ::T.untyped) +end + +class Errno::EQFULL +end class Errno::ERPCMISMATCH Errno = ::T.let(nil, ::T.untyped) @@ -8236,6 +8349,14 @@ module Homebrew::Livecheck extend ::T::Private::Methods::SingletonMethodHooks end +module Homebrew::MissingFormula + extend ::T::Private::Methods::SingletonMethodHooks +end + +module Homebrew::Search + include ::Homebrew::Search::Extension +end + module Homebrew::Settings extend ::T::Private::Methods::MethodHooks extend ::T::Private::Methods::SingletonMethodHooks @@ -9592,11 +9713,13 @@ module Kernel extend ::T::Private::Methods::SingletonMethodHooks def self.at_exit(); end + def self.autoload(_, _1); end + def self.fork(); end def self.gem(dep, *reqs); end - def self.load(*_); end + def self.load(path, wrap=T.unsafe(nil)); end def self.require(path); end end @@ -11906,6 +12029,8 @@ class Module def anonymous?(); end + def autoload_without_bootsnap(_, _1); end + def context(*a, &b); end def deprecate(*method_names); end @@ -12247,8 +12372,6 @@ end class Net::HTTPAlreadyReported end -Net::HTTPClientError::EXCEPTION_TYPE = Net::HTTPServerException - Net::HTTPClientErrorCode = Net::HTTPClientError class Net::HTTPEarlyHints @@ -12314,8 +12437,6 @@ end class Net::HTTPRangeNotSatisfiable end -Net::HTTPRedirection::EXCEPTION_TYPE = Net::HTTPRetriableError - Net::HTTPRedirectionCode = Net::HTTPRedirection Net::HTTPRequestURITooLarge = Net::HTTPURITooLong @@ -12324,8 +12445,6 @@ Net::HTTPResponceReceiver = Net::HTTPResponse Net::HTTPRetriableCode = Net::HTTPRedirection -Net::HTTPServerError::EXCEPTION_TYPE = Net::HTTPFatalError - Net::HTTPServerErrorCode = Net::HTTPServerError Net::HTTPSession = Net::HTTP @@ -12506,6 +12625,7 @@ class Object def to_query(key); end def to_yaml(options=T.unsafe(nil)); end + APPLE_GEM_HOME = ::T.let(nil, ::T.untyped) ARGF = ::T.let(nil, ::T.untyped) ARGV = ::T.let(nil, ::T.untyped) BUG_REPORTS_URL = ::T.let(nil, ::T.untyped) @@ -12570,6 +12690,8 @@ class Object RUBY_DESCRIPTION = ::T.let(nil, ::T.untyped) RUBY_ENGINE = ::T.let(nil, ::T.untyped) RUBY_ENGINE_VERSION = ::T.let(nil, ::T.untyped) + RUBY_FRAMEWORK = ::T.let(nil, ::T.untyped) + RUBY_FRAMEWORK_VERSION = ::T.let(nil, ::T.untyped) RUBY_PATCHLEVEL = ::T.let(nil, ::T.untyped) RUBY_PATH = ::T.let(nil, ::T.untyped) RUBY_PLATFORM = ::T.let(nil, ::T.untyped) @@ -12622,11 +12744,7 @@ class OpenSSL::KDF::KDFError end module OpenSSL::KDF - def self.hkdf(*_); end - def self.pbkdf2_hmac(*_); end - - def self.scrypt(*_); end end class OpenSSL::OCSP::Request @@ -12635,29 +12753,20 @@ end OpenSSL::PKCS7::Signer = OpenSSL::PKCS7::SignerInfo -class OpenSSL::PKey::EC - EXPLICIT_CURVE = ::T.let(nil, ::T.untyped) -end - class OpenSSL::PKey::EC::Point def to_octet_string(_); end end module OpenSSL::SSL - OP_ALLOW_NO_DHE_KEX = ::T.let(nil, ::T.untyped) OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION = ::T.let(nil, ::T.untyped) OP_CRYPTOPRO_TLSEXT_BUG = ::T.let(nil, ::T.untyped) OP_LEGACY_SERVER_CONNECT = ::T.let(nil, ::T.untyped) - OP_NO_ENCRYPT_THEN_MAC = ::T.let(nil, ::T.untyped) - OP_NO_RENEGOTIATION = ::T.let(nil, ::T.untyped) - OP_NO_TLSv1_3 = ::T.let(nil, ::T.untyped) OP_SAFARI_ECDHE_ECDSA_BUG = ::T.let(nil, ::T.untyped) OP_TLSEXT_PADDING = ::T.let(nil, ::T.untyped) SSL2_VERSION = ::T.let(nil, ::T.untyped) SSL3_VERSION = ::T.let(nil, ::T.untyped) TLS1_1_VERSION = ::T.let(nil, ::T.untyped) TLS1_2_VERSION = ::T.let(nil, ::T.untyped) - TLS1_3_VERSION = ::T.let(nil, ::T.untyped) TLS1_VERSION = ::T.let(nil, ::T.untyped) end @@ -17069,6 +17178,7 @@ module Psych end module Psych + extend ::Bootsnap::CompileCache::YAML::Patch def self.add_builtin_type(type_tag, &block); end def self.add_domain_type(domain, type_tag, &block); end @@ -27835,6 +27945,10 @@ class RubyVM::AbstractSyntaxTree::Node def pretty_print_children(q, names=T.unsafe(nil)); end end +class RubyVM::InstructionSequence + extend ::Bootsnap::CompileCache::ISeq::InstructionSequenceMixin +end + module RubyVM::MJIT end @@ -28205,6 +28319,16 @@ end module SimpleCov::Formatter end +class SimpleCov::Formatter::CoberturaFormatter + def format(result); end + DTD_URL = ::T.let(nil, ::T.untyped) + RESULT_FILE_NAME = ::T.let(nil, ::T.untyped) + VERSION = ::T.let(nil, ::T.untyped) +end + +class SimpleCov::Formatter::CoberturaFormatter +end + class SimpleCov::Formatter::HTMLFormatter def branchable_result?(); end @@ -28717,6 +28841,7 @@ class Socket IPV6_PATHMTU = ::T.let(nil, ::T.untyped) IPV6_RECVPATHMTU = ::T.let(nil, ::T.untyped) IPV6_USE_MIN_MTU = ::T.let(nil, ::T.untyped) + IP_DONTFRAG = ::T.let(nil, ::T.untyped) IP_PORTRANGE = ::T.let(nil, ::T.untyped) IP_RECVDSTADDR = ::T.let(nil, ::T.untyped) IP_RECVIF = ::T.let(nil, ::T.untyped) @@ -28808,6 +28933,7 @@ module Socket::Constants IPV6_PATHMTU = ::T.let(nil, ::T.untyped) IPV6_RECVPATHMTU = ::T.let(nil, ::T.untyped) IPV6_USE_MIN_MTU = ::T.let(nil, ::T.untyped) + IP_DONTFRAG = ::T.let(nil, ::T.untyped) IP_PORTRANGE = ::T.let(nil, ::T.untyped) IP_RECVDSTADDR = ::T.let(nil, ::T.untyped) IP_RECVIF = ::T.let(nil, ::T.untyped) From f4ae7db961e8e2027df3de36a301a727882abac8 Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Fri, 2 Apr 2021 12:05:42 -0400 Subject: [PATCH 15/19] Do not consider directory or flag --- .github/workflows/tests.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f2cb3a5fd7..68e12ecddb 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -214,9 +214,6 @@ jobs: run: ls -al /home/linuxbrew/.linuxbrew/Homebrew/Library/Homebrew/test/coverage - uses: codecov/codecov-action@e156083f13aff6830c92fc5faa23505779fbf649 # v1.2.1 - with: - directory: /home/linuxbrew/.linuxbrew/Homebrew/Library/Homebrew/test/coverage - flags: ${{ matrix.name }} test-default-formula-linux: name: test default formula (Linux) From 9a9c5f28891ff2eda4fb5a3c4f6f9b735f9a70bc Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Fri, 2 Apr 2021 12:15:54 -0400 Subject: [PATCH 16/19] Codecov fixes are not needed --- .github/codecov.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/codecov.yml b/.github/codecov.yml index 20c1e42d0a..65b70e6ea5 100644 --- a/.github/codecov.yml +++ b/.github/codecov.yml @@ -1,5 +1,3 @@ -fixes: - - "::Library/Homebrew/" coverage: round: nearest status: From e26b13a74ab9d6c2aa480f54677cece668b51098 Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Fri, 2 Apr 2021 13:19:05 -0400 Subject: [PATCH 17/19] Add Codecov on macOS builds --- .github/workflows/tests.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 68e12ecddb..481eac962d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -301,3 +301,5 @@ jobs: HOMEBREW_LANGUAGES: en-GB - run: brew test-bot --only-formulae --test-default-formula + + - uses: codecov/codecov-action@e156083f13aff6830c92fc5faa23505779fbf649 # v1.2.1 From 853c68e3d0535390088d45c92216e8130b07a391 Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Fri, 2 Apr 2021 13:44:11 -0400 Subject: [PATCH 18/19] empty commit From 5808e02a7cbc1764f1853c459d15097f8e647dff Mon Sep 17 00:00:00 2001 From: Tom Hu Date: Fri, 2 Apr 2021 14:38:52 -0400 Subject: [PATCH 19/19] Update .github/workflows/tests.yml Co-authored-by: Mike McQuaid --- .github/workflows/tests.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 481eac962d..1f5be65e6a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -210,9 +210,6 @@ jobs: env: HOMEBREW_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Show coverage files - run: ls -al /home/linuxbrew/.linuxbrew/Homebrew/Library/Homebrew/test/coverage - - uses: codecov/codecov-action@e156083f13aff6830c92fc5faa23505779fbf649 # v1.2.1 test-default-formula-linux: