Skip to content
Snippets Groups Projects
Commit 2ec54233 authored by Mike McQuaid's avatar Mike McQuaid
Browse files

test-bot: --ci-upload can upload from current dir.

Look in the current directory rather than only allowing upload from
Jenkins.
parent 287ddb64
No related branches found
No related tags found
No related merge requests found
......@@ -875,11 +875,6 @@ module Homebrew
# Don't trust formulae we're uploading
ENV["HOMEBREW_DISABLE_LOAD_FORMULA"] = "1"
jenkins = ENV["JENKINS_HOME"]
job = ENV["UPSTREAM_JOB_NAME"]
id = ENV["UPSTREAM_BUILD_ID"]
raise "Missing Jenkins variables!" if !jenkins || !job || !id
bintray_user = ENV["BINTRAY_USER"]
bintray_key = ENV["BINTRAY_KEY"]
if !bintray_user || !bintray_key
......@@ -891,11 +886,20 @@ module Homebrew
ENV["HUDSON_SERVER_COOKIE"] = nil
ENV["JENKINS_SERVER_COOKIE"] = nil
ENV["HUDSON_COOKIE"] = nil
ENV["COVERALLS_REPO_TOKEN"] = nil
ARGV << "--verbose"
bottles = Dir["#{jenkins}/jobs/#{job}/configurations/axis-version/*/builds/#{id}/archive/*.bottle*.*"]
return if bottles.empty?
bottles = Dir["*.bottle*.*"]
if bottles.empty?
jenkins = ENV["JENKINS_HOME"]
job = ENV["UPSTREAM_JOB_NAME"]
id = ENV["UPSTREAM_BUILD_ID"]
raise "Missing Jenkins variables!" if !jenkins || !job || !id
bottles = Dir["#{jenkins}/jobs/#{job}/configurations/axis-version/*/builds/#{id}/archive/*.bottle*.*"]
return if bottles.empty?
end
FileUtils.cp bottles, Dir.pwd, :verbose => true
json_files = Dir.glob("*.bottle.json")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment