diff options
| author | Mike McQuaid | 2013-12-10 20:35:21 +0000 |
|---|---|---|
| committer | Mike McQuaid | 2013-12-10 20:35:21 +0000 |
| commit | b1331e62b1cc6ae7ed71ad70bfc3d5e18efccdf2 (patch) | |
| tree | 64f822c2ef1a577e036bc99e4e6b521b0581f957 /Library/Contributions | |
| parent | 50aa91940daa7c8f070d48155d3f07692f47f41a (diff) | |
| download | brew-b1331e62b1cc6ae7ed71ad70bfc3d5e18efccdf2.tar.bz2 | |
brew-test-bot: upload job fixes.
Diffstat (limited to 'Library/Contributions')
| -rwxr-xr-x | Library/Contributions/cmd/brew-test-bot.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Library/Contributions/cmd/brew-test-bot.rb b/Library/Contributions/cmd/brew-test-bot.rb index 4c84ac695..5b7b2d330 100755 --- a/Library/Contributions/cmd/brew-test-bot.rb +++ b/Library/Contributions/cmd/brew-test-bot.rb @@ -246,7 +246,7 @@ class Test def setup @category = __method__ - + return if ARGV.include? "--skip-setup" test "brew doctor" test "brew --env" test "brew --config" @@ -374,10 +374,10 @@ class Test def run cleanup_before download - setup unless ARGV.include? "--skip-setup" if ARGV.include? '--ci-pr-upload' or ARGV.include? '--ci-testing-upload' bottle_upload else + setup homebrew formulae.each do |f| formula(f) @@ -394,16 +394,16 @@ class Test id = ENV['UPSTREAM_BUILD_ID'] raise "Missing Jenkins variables!" unless jenkins and job and id - test "cp #{jenkins}/jobs/'#{job}'/configurations/axis-version/*/builds/#{id}/archive/*.bottle*.* ." + test "cp #{jenkins}/jobs/\"#{job}\"/configurations/axis-version/*/builds/#{id}/archive/*.bottle*.* ." test "brew bottle --merge --write *.bottle*.rb" - remote = "https://github.com/BrewTestBot/homebrew.git" + remote = "git@github.com:BrewTestBot/homebrew.git" pr = ENV['UPSTREAM_PULL_REQUEST'] tag = pr ? "pr-#{pr}" : "testing-#{id}" test "git push --force #{remote} :refs/tags/#{tag}" path = "/home/frs/project/m/ma/machomebrew/Bottles/" - url = "mikemcquaid,machomebrew@frs.sourceforge.net:#{path}" + url = "BrewTestBot,machomebrew@frs.sourceforge.net:#{path}" options = "--partial --progress --human-readable --compress" test "rsync #{options} *.bottle.tar.gz #{url}" test "git tag --force #{tag}" |