From 595bf08a57682fcd42ab3d0a6d01d5d26d365e1e Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Fri, 29 Jun 2018 19:59:07 +0100 Subject: [PATCH 1/6] test-bot: don't enable linkage cache. After https://github.com/Homebrew/brew/pull/4390 is merged this will be enabled by default. --- cmd/brew-test-bot.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/cmd/brew-test-bot.rb b/cmd/brew-test-bot.rb index ae2bd07a..df916cc9 100755 --- a/cmd/brew-test-bot.rb +++ b/cmd/brew-test-bot.rb @@ -1504,7 +1504,6 @@ def sanitize_argv_and_env ENV["HOMEBREW_DEVELOPER"] = "1" ENV["HOMEBREW_NO_AUTO_UPDATE"] = "1" ENV["HOMEBREW_NO_EMOJI"] = "1" - ENV["HOMEBREW_LINKAGE_CACHE"] = "1" ENV["HOMEBREW_FAIL_LOG_LINES"] = "150" ENV["PATH"] = "#{HOMEBREW_PREFIX}/bin:#{HOMEBREW_PREFIX}/sbin:#{ENV["PATH"]}" From e4b2e604ccbe1eabfc8d5344f35addc86b708518 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Fri, 29 Jun 2018 20:15:49 +0100 Subject: [PATCH 2/6] test-bot: use correct bottle domain variable. --- 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 ae2bd07a..7d4047ae 100755 --- a/cmd/brew-test-bot.rb +++ b/cmd/brew-test-bot.rb @@ -1417,7 +1417,7 @@ def test_ci_upload(tap) bottle_hash["bottle"]["tags"].each_value do |tag_hash| filename = tag_hash["filename"] bintray_filename_url = - "#{BottleSpecification::DEFAULT_DOMAIN}/#{bintray_repo}/#{filename}" + "#{HOMEBREW_BOTTLE_DOMAIN}/#{bintray_repo}/#{filename}" filename_already_published = if ARGV.include?("--dry-run") puts "curl -I --output /dev/null #{bintray_filename_url}" false From fd792164b94bd7cbaa787bdf78fd8c57f9bdabbb Mon Sep 17 00:00:00 2001 From: commitay Date: Wed, 4 Jul 2018 13:45:49 +1000 Subject: [PATCH 3/6] testbottest: add bottle block --- Formula/testbottest.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Formula/testbottest.rb b/Formula/testbottest.rb index 1919581a..f6d18f27 100644 --- a/Formula/testbottest.rb +++ b/Formula/testbottest.rb @@ -5,6 +5,9 @@ class Testbottest < Formula sha256 "246c4839624d0b97338ce976100d56bd9331d9416e178eb0f74ef050c1dbdaad" head "https://github.com/Homebrew/homebrew-test-bot.git" + bottle do + end + depends_on :java => ["1.0+", :optional] fails_with :gcc do From 9ad1f1fe8ce1c7f1a7275176f23329401bab80f3 Mon Sep 17 00:00:00 2001 From: commitay Date: Thu, 5 Jul 2018 18:09:23 +1000 Subject: [PATCH 4/6] travis.yml: update to xcode 9.4 --- .travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index cb5fa060..373d56e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ -language: c +language: ruby +rvm: system cache: directories: - $HOME/Library/Caches/Homebrew/style @@ -12,10 +13,8 @@ matrix: fast_finish: true include: - os: osx - compiler: clang - osx_image: xcode9.2 + osx_image: xcode9.4 - os: linux - compiler: gcc sudo: false before_install: From ff54ebf8cb1280e83f3dd73557a3452123a12bdb Mon Sep 17 00:00:00 2001 From: commitay Date: Wed, 4 Jul 2018 13:45:49 +1000 Subject: [PATCH 5/6] Revert "testbottest: add bottle block" This reverts commit fd792164b94bd7cbaa787bdf78fd8c57f9bdabbb. --- Formula/testbottest.rb | 3 --- 1 file changed, 3 deletions(-) diff --git a/Formula/testbottest.rb b/Formula/testbottest.rb index f6d18f27..1919581a 100644 --- a/Formula/testbottest.rb +++ b/Formula/testbottest.rb @@ -5,9 +5,6 @@ class Testbottest < Formula sha256 "246c4839624d0b97338ce976100d56bd9331d9416e178eb0f74ef050c1dbdaad" head "https://github.com/Homebrew/homebrew-test-bot.git" - bottle do - end - depends_on :java => ["1.0+", :optional] fails_with :gcc do From 0566610e4178d911c0db52c4d263f8358e5c2f3f Mon Sep 17 00:00:00 2001 From: commitay Date: Fri, 6 Jul 2018 10:34:13 +1000 Subject: [PATCH 6/6] brew-test-bot: run codecov on high sierra --- 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 eaad7f8f..2877408b 100755 --- a/cmd/brew-test-bot.rb +++ b/cmd/brew-test-bot.rb @@ -1525,7 +1525,7 @@ def sanitize_argv_and_env # Only report coverage if build runs on macOS and this is indeed Homebrew, # as we don't want this to be averaged with inferior Linux test coverage. - if OS.mac? && MacOS.version == :sierra && (ENV["CODECOV_TOKEN"] || travis) + if OS.mac? && MacOS.version == :high_sierra && (ENV["CODECOV_TOKEN"] || travis) ARGV << "--coverage" end