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

fix update-test

Browse Source 
Previously, `brew update-test` is run against master branch of local
repo. However, we test PR using a detached branch in `brew test-bot`.
The result is `brew update-test` will always be up-to-date in `test-bot`.

To fix it, we create two local copies of git repo, and set master branch
to start and end sha1 correspondingly. After that, `brew update` will be
run to simulate the change between start and end sha1.

Closes Homebrew/homebrew#43902.

Signed-off-by: Xu Cheng <xucheng@me.com>
This commit is contained in:
Xu Cheng 2015-09-14 15:19:05 +08:00
parent 71198041c6
commit 6792847fc1
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,26 +2,33 @@ require "extend/ENV"
module Homebrew module Homebrew
def update_test def update_test
homebrew_repository_git = HOMEBREW_REPOSITORY/".git"
mktemp do mktemp do
curdir = Pathname.new(Dir.pwd) curdir = Pathname.new(Dir.pwd)
ohai "Setup test environment..." oh1 "Setup test environment..."
# copy Homebrew installation # copy Homebrew installation
cp_r homebrew_repository_git, curdir/".git" cp_r HOMEBREW_REPOSITORY/".git", curdir/".git"
safe_system "git", "checkout", "--force", "master" start_sha1 = Utils.popen_read("git", "rev-parse", "origin/master").chomp
safe_system "git", "reset", "--hard", "origin/master" end_sha1 = Utils.popen_read("git", "rev-parse", "HEAD").chomp
# set git origin # set git origin to another copy
safe_system "git", "config", "remote.origin.url", "file://#{homebrew_repository_git}" cp_r HOMEBREW_REPOSITORY/".git", curdir/"remote.git"
safe_system "git", "config", "remote.origin.url", "file://#{curdir}/remote.git"
# force push origin to end_sha1
safe_system "git", "checkout", "--force", "master"
safe_system "git", "reset", "--hard", end_sha1
safe_system "git", "push", "--force", "origin", "master"
# set test copy to start_sha1
safe_system "git", "reset", "--hard", start_sha1
# update ENV["PATH"] # update ENV["PATH"]
ENV.extend(Stdenv) ENV.extend(Stdenv)
ENV.prepend_path "PATH", "#{curdir}/bin" ENV.prepend_path "PATH", "#{curdir}/bin"
# run brew update # run brew update
ohai "Running brew update..." oh1 "Running brew update..."
safe_system "brew", "update", "--verbose" safe_system "brew", "update", "--verbose"
end end
end end