travis-build-tools 2.0.46.0 → 2.0.48.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2NjMWE0NGFlNzg5N2U0YmNhYjI5MTBjOWZkY2E4OGQzYjNiODk5MQ==
+    MzNjMzZmMWIzMmU3ZDIzYWFiOTRjMjhiNWFhZDY5OTQ3ZGIxM2U0Yw==
   data.tar.gz: !binary |-
-    MDAxZmY2ZmU3ZTY3MjlmNmE1MGUyYTIwYzAyYWQzMmIxZTIyY2NiMw==
+    ZDllNTE2NzI5NzQ3MDQwOGYzZjE5NTg1OWUzZDM0OGRmYmQ4NjdjNg==
 SHA512:
   metadata.gz: !binary |-
-    NmMwMTFmMTI0ZTg3NThlZjJjZTBiZTYyYTBjMDZiOWRlOGE5MmU1ZGVhYzcy
-    NzdkOWU5YjE4OTYwZjk5NGM1ODExYWIwMTc1YmZkYmIxMmYxZmE3MzQ0NjNk
-    MWZmM2MxN2QzNzMzY2YwM2MwYmJiMmM3ZTA2OWZkNmRjZTgzYTA=
+    ZTMxN2VhZjcxMjM4Yzk2OTE4MzQ2YjcwYmI3NDE0ZTNmMTIyODIzODgyOWFi
+    NzlhMGNmYjdkNTI5YWU0YTA0ZjkwY2I0NjI3NzEzOWE1ZDEwMjhmYzYzNzU5
+    ODgwOTZhOTVhYjVkNDMyOTgzYjc3OGMxNWI5ZjkzMDQzMTVkYmY=
   data.tar.gz: !binary |-
-    NjVmMzhjMjg1OGIyYzBiMTFlMGRlY2RiNWM3MWU0MGQ2YTYwODQwODJmNGYy
-    MDdkMGViYzc2MzQ0ZTQzMGY3ZDFmYWFiZmRhYWM0MDg2N2RkZmFhMTExYzNi
-    MzNlMzI3ODYxYzU2YzkwZGEyZTA3YzkyMjc5YjlmZWYzZTVmZjk=
+    NmZkMDE5MjljMGIxMjM1OTg0Y2I1MTI5NGZlZWQyNDc2MGFjYjU2NWZmMGVj
+    NzUzZTNiOGVkNTU0YWE4YWE1YTgyZjYzZTg0MGVmMjU2M2VjZGY3ZGMyODZj
+    ZGNlMzFhYjIzZjIyYjUzZDRhMDU3OTQ5OWFjMjAwZThmMzRmYmI=

data/lib/travis-build-tools/builder.rb

@@ -3,10 +3,13 @@ module TravisBuildTools
     def initialize(service_user, git_repository = nil)
       @service_user = service_user
       origin_url = %x[git config --get remote.origin.url]
-      @git_repository = git_repository || origin_url.split('://')[1] || origin_url.split('@')[1]
-
-      raise 'git_repository is not specified' if !@git_repository
-      raise 'service_user is not specified' if !@service_user
+      git_repository ||= origin_url.split('://')[1] || origin_url.split('@')[1]
+      raise 'git_repository is not specified' if !git_repository
+      raise 'service_user is not specified' if !service_user
+      
+      #Set the service remote
+      puts %x[git remote add service https://#{service_user}@#{git_repository}]
+      puts %x[git fetch service]
     end
 
     def publish_git_tag(tag_name)
@@ -19,7 +22,7 @@ module TravisBuildTools
         puts %x[git tag #{tag_name} -a -m "Generated tag from TravisCI."]
         puts "Pushing Git tag #{tag_name}."
 
-        %x[git push --tags --quiet https://#{@service_user}@#{@git_repository} #{tag_name} > /dev/null 2>&1]
+        %x[git push --tags --quiet service #{tag_name} > /dev/null 2>&1]
       end
     end
     
@@ -40,10 +43,10 @@ module TravisBuildTools
         next_branch_to_merge = (sorted_branches.drop_while{|b| b <= current_release_version}.map{|v| release_branch_name + v.to_s} + ['master']).first
 
         #create a merge commit for that branch
-        puts %x[git merge --no-ff origin/#{next_branch_to_merge}]
+        puts %x[git merge --no-ff service/#{next_branch_to_merge} -m"Merge remote-tracking branch '#{ENV['TRAVIS_BRANCH']}'"]
         puts "Merging to downstream branch: #{next_branch_to_merge}"
         #push origin for that branch using the service user
-        %x[git push --quiet https://#{@service_user}@#{@git_repository} HEAD:#{next_branch_to_merge} > /dev/null 2>&1]
+        %x[git push --quiet service HEAD:#{next_branch_to_merge} > /dev/null 2>&1]
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: travis-build-tools
 version: !ruby/object:Gem::Version
-  version: 2.0.46.0
+  version: 2.0.48.0
 platform: ruby
 authors:
 - Warren Parad