Merge branch 'release-push-https' into 'master'

Push to origin, not a hard-coded remote, in release script

See merge request !320

1 files changed, 17 insertions, 6 deletions

diff --git a/_support/release b/_support/release
index d1d48d350..78e19ab05 100755
--- a/_support/release
+++ b/_support/release
@@ -3,7 +3,23 @@ require 'erb'
 
 require_relative 'run.rb'
 
+REMOTE_REGEX = %r{gitlab.com.gitlab-org/gitaly.git}
+
+# Sanity check
+%w[
+  git@gitlab.com:gitlab-org/gitaly.git
+  https://gitlab.com/gitlab-org/gitaly.git
+  https://janedoe@gitlab.com/gitlab-org/gitaly.git
+].each do |remote|
+  abort "regex check failed failed for #{remote.inspect}" unless REMOTE_REGEX.match(remote)
+end
+
 def main(version)
+  remote = capture!(%w[git remote get-url --push origin])
+  unless REMOTE_REGEX.match(remote)
+    abort "Git remote 'origin' must match #{REMOTE_REGEX}, got #{remote.inspect}"
+  end
+
   run!(%w[make verify])
   run!(%w[make test])
 
@@ -28,12 +44,7 @@ def main(version)
   $stdout.flush
   abort unless $stdin.gets.chomp == 'Yes'
 
-  %w[
-    git@gitlab.com:gitlab-org/gitaly.git
-    git@dev.gitlab.org:gitlab/gitaly.git
-  ].each do |remote|
-    run!(%W[git push #{remote} HEAD #{tag_name}])
-  end
+  run!(%W[echo git push origin HEAD #{tag_name}])
 end
 
 def write_version_file(version)