From 438939cea51f09a1304d8d6903815479e1cbb7e8 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Sun, 30 Dec 2018 20:05:29 +0000 Subject: [PATCH 1/2] tests: delete HOMEBREW_INSTALL_CLEANUP for test consistency. --- Library/Homebrew/dev-cmd/tests.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/Library/Homebrew/dev-cmd/tests.rb b/Library/Homebrew/dev-cmd/tests.rb index 2d0e5b3ffa..0ef2bb0141 100644 --- a/Library/Homebrew/dev-cmd/tests.rb +++ b/Library/Homebrew/dev-cmd/tests.rb @@ -61,6 +61,7 @@ module Homebrew ENV.delete("HOMEBREW_NO_GITHUB_API") ENV.delete("HOMEBREW_NO_EMOJI") ENV.delete("HOMEBREW_DEVELOPER") + ENV.delete("HOMEBREW_INSTALL_CLEANUP") ENV["HOMEBREW_NO_ANALYTICS_THIS_RUN"] = "1" ENV["HOMEBREW_NO_COMPAT"] = "1" if args.no_compat? ENV["HOMEBREW_TEST_GENERIC_OS"] = "1" if args.generic? From 0de21812a73b5bbd54e59e9d4b94cfbe50be1f69 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Sun, 30 Dec 2018 20:06:13 +0000 Subject: [PATCH 2/2] Use Coveralls for coverage reporting. --- .gitignore | 3 +-- .travis.yml | 33 ---------------------------- Library/Homebrew/test/.codecov.yml | 10 --------- Library/Homebrew/test/Gemfile | 2 +- Library/Homebrew/test/Gemfile.lock | 17 +++++++++----- Library/Homebrew/test/spec_helper.rb | 20 +++++++++++++---- azure-pipelines.yml | 3 ++- 7 files changed, 31 insertions(+), 57 deletions(-) delete mode 100644 .travis.yml delete mode 100644 Library/Homebrew/test/.codecov.yml diff --git a/.gitignore b/.gitignore index c198f1690d..b6de9690ef 100644 --- a/.gitignore +++ b/.gitignore @@ -119,9 +119,8 @@ /docs/.jekyll-metadata # Unignore our root-level metadata files. +!/.editorconfig !/.gitignore -!/.travis.yml -!/.codecov.yml !/.yardopts !/CHANGELOG.md !/CODE_OF_CONDUCT.md diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index d46c148abb..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,33 +0,0 @@ -language: ruby -rvm: system -os: osx -osx_image: xcode10 - -cache: - directories: - - $HOME/Library/Caches/Homebrew/style - - $HOME/Library/Caches/Homebrew/tests - - Library/Homebrew/vendor/bundle - -branches: - only: - - master - -env: - - HOMEBREW_FORCE_HOMEBREW_ON_LINUX=1 - -before_install: - - HOMEBREW_REPOSITORY="$(brew --repo)" - - sudo chown -R "$USER" "$HOMEBREW_REPOSITORY" - # trigger vendored ruby installation - - brew help - - mv "$HOMEBREW_REPOSITORY/Library/Taps" "$PWD/Library" - - sudo rm -rf "$HOMEBREW_REPOSITORY" - - sudo ln -s "$PWD" "$HOMEBREW_REPOSITORY" - - travis_retry git clone --depth=1 https://github.com/Homebrew/homebrew-test-bot Library/Taps/homebrew/homebrew-test-bot - -script: - - travis_wait 60 brew test-bot - -notifications: - slack: machomebrew:1XNF7p1JRCdBUuKaeSwsWEc1 diff --git a/Library/Homebrew/test/.codecov.yml b/Library/Homebrew/test/.codecov.yml deleted file mode 100644 index 9d3951d601..0000000000 --- a/Library/Homebrew/test/.codecov.yml +++ /dev/null @@ -1,10 +0,0 @@ -comment: off -fixes: - - "::Library/Homebrew/" -coverage: - round: nearest - precision: 2 - status: - project: - default: - threshold: 0.05% diff --git a/Library/Homebrew/test/Gemfile b/Library/Homebrew/test/Gemfile index dae754c27b..16cc49d415 100644 --- a/Library/Homebrew/test/Gemfile +++ b/Library/Homebrew/test/Gemfile @@ -12,7 +12,7 @@ group :development do end group :coverage do - gem "codecov", require: false + gem "coveralls", require: false gem "simplecov", require: false gem "simplecov-cobertura", require: false end diff --git a/Library/Homebrew/test/Gemfile.lock b/Library/Homebrew/test/Gemfile.lock index 10caf8858b..95dae7da6b 100644 --- a/Library/Homebrew/test/Gemfile.lock +++ b/Library/Homebrew/test/Gemfile.lock @@ -2,10 +2,12 @@ GEM remote: https://rubygems.org/ specs: ast (2.4.0) - codecov (0.1.14) - json - simplecov - url + coveralls (0.8.22) + json (>= 1.8, < 3) + simplecov (~> 0.16.1) + term-ansicolor (~> 1.3) + thor (~> 0.19.4) + tins (~> 1.6) diff-lcs (1.3) docile (1.3.1) hpricot (0.8.6) @@ -60,14 +62,17 @@ GEM simplecov-cobertura (1.3.0) simplecov (~> 0.8) simplecov-html (0.10.2) + term-ansicolor (1.7.0) + tins (~> 1.0) + thor (0.19.4) + tins (1.20.2) unicode-display_width (1.4.1) - url (0.3.2) PLATFORMS ruby DEPENDENCIES - codecov + coveralls parallel_tests ronn rspec diff --git a/Library/Homebrew/test/spec_helper.rb b/Library/Homebrew/test/spec_helper.rb index 531f474e84..7a96b20c9a 100644 --- a/Library/Homebrew/test/spec_helper.rb +++ b/Library/Homebrew/test/spec_helper.rb @@ -2,10 +2,22 @@ if ENV["HOMEBREW_TESTS_COVERAGE"] require "simplecov" formatters = [SimpleCov::Formatter::HTMLFormatter] - if ENV["HOMEBREW_CODECOV_TOKEN"] || ENV["HOMEBREW_TRAVIS_CI"] - require "codecov" - formatters << SimpleCov::Formatter::Codecov - ENV["CODECOV_TOKEN"] = ENV["HOMEBREW_CODECOV_TOKEN"] + if ENV["HOMEBREW_COVERALLS_REPO_TOKEN"] || ENV["HOMEBREW_TRAVIS_CI"] + require "coveralls" + + if !ENV["HOMEBREW_COLOR"] && (ENV["HOMEBREW_NO_COLOR"] || !$stdout.tty?) + Coveralls::Output.no_color + end + + formatters << Coveralls::SimpleCov::Formatter + + ENV["CI_NAME"] = ENV["HOMEBREW_CI_NAME"] + ENV["CI_JOB_ID"] = ENV["TEST_ENV_NUMBER"] || "1" + ENV["CI_BUILD_NUMBER"] = ENV["HOMEBREW_CI_BUILD_NUMBER"] + ENV["CI_BUILD_URL"] = ENV["HOMEBREW_CI_BUILD_URL"] + ENV["CI_BRANCH"] = ENV["HOMEBREW_CI_BRANCH"] + ENV["CI_PULL_REQUEST"] = ENV["HOMEBREW_CI_PULL_REQUEST"] + ENV["COVERALLS_REPO_TOKEN"] = ENV["HOMEBREW_COVERALLS_REPO_TOKEN"] end if ENV["HOMEBREW_AZURE_PIPELINES"] diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a812d62dfa..f99a0ae86c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -10,10 +10,11 @@ jobs: sudo rm -rf "$HOMEBREW_REPOSITORY" sudo ln -s "$PWD" "$HOMEBREW_REPOSITORY" brew update-reset Library/Taps/homebrew/homebrew-core - brew test-bot --coverage + brew test-bot displayName: Run brew test-bot env: HOMEBREW_GITHUB_API_TOKEN: $(github.publicApiToken) + HOMEBREW_COVERALLS_REPO_TOKEN: $(coveralls.homebrewBrewApiToken) - task: PublishTestResults@2 displayName: Publish test-bot test results