admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #9028 from MikeMcQuaid/update-test-tweaks

Browse Source 
update-test: more improvements.
This commit is contained in:
Mike McQuaid 2020-11-04 13:58:45 +00:00 committed by GitHub
commit 3e36285575
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Library/Homebrew/dev-cmd/update-test.rb
View File

@ -30,12 +30,24 @@ module Homebrew
def update_test def update_test
args = update_test_args.parse args = update_test_args.parse
# Avoid `update-report.rb` tapping Homebrew/homebrew-core
ENV["HOMEBREW_UPDATE_TEST"] = "1" ENV["HOMEBREW_UPDATE_TEST"] = "1"
# Avoid accidentally updating when we don't expect it.
ENV["HOMEBREW_NO_AUTO_UPDATE"] = "1"
# Use default behaviours
ENV["HOMEBREW_AUTO_UPDATE_SECS"] = nil
ENV["HOMEBREW_DEVELOPER"] = nil
ENV["HOMEBREW_DEV_CMD_RUN"] = nil
ENV["HOMEBREW_MERGE"] = nil
ENV["HOMEBREW_NO_UPDATE_CLEANUP"] = nil
branch = if args.to_tag? branch = if args.to_tag?
ENV["HOMEBREW_UPDATE_TO_TAG"] = "1" ENV["HOMEBREW_UPDATE_TO_TAG"] = "1"
"stable" "stable"
else else
ENV["HOMEBREW_UPDATE_TO_TAG"] = nil
"master" "master"
end end
@ -98,6 +110,7 @@ module Homebrew
safe_system "git", "clone", "#{HOMEBREW_REPOSITORY}/.git", "remote.git", safe_system "git", "clone", "#{HOMEBREW_REPOSITORY}/.git", "remote.git",
"--bare", "--branch", "master", "--single-branch" "--bare", "--branch", "master", "--single-branch"
safe_system "git", "config", "remote.origin.url", "#{curdir}/remote.git" safe_system "git", "config", "remote.origin.url", "#{curdir}/remote.git"
ENV["HOMEBREW_BREW_GIT_REMOTE"] = "#{curdir}/remote.git"
# force push origin to end_commit # force push origin to end_commit
safe_system "git", "checkout", "-B", "master", end_commit safe_system "git", "checkout", "-B", "master", end_commit
@ -109,9 +122,12 @@ module Homebrew
# update ENV["PATH"] # update ENV["PATH"]
ENV["PATH"] = PATH.new(ENV["PATH"]).prepend(curdir/"bin") ENV["PATH"] = PATH.new(ENV["PATH"]).prepend(curdir/"bin")
# run brew help to install portable-ruby (if needed)
quiet_system "brew", "help"
# run brew update # run brew update
oh1 "Running brew update..." oh1 "Running brew update..."
safe_system "brew", "update", "--verbose" safe_system "brew", "update", "--verbose", "--debug"
actual_end_commit = Utils.popen_read("git", "rev-parse", branch).chomp actual_end_commit = Utils.popen_read("git", "rev-parse", branch).chomp
if actual_end_commit != end_commit if actual_end_commit != end_commit
start_log = Utils.popen_read("git", "log", "-1", "--decorate", "--oneline", start_commit).chomp start_log = Utils.popen_read("git", "log", "-1", "--decorate", "--oneline", start_commit).chomp