Merge branch 'master' into me-upgrade-sonarscanner

Author: mustafa-travisci

lib/travis/build.rb

@@ -16,17 +16,15 @@ def config
     module_function :config
 
     def top
-      @top ||= Pathname.new(
-        `git rev-parse --show-toplevel 2>/dev/null`.strip
-      )
+      ::Travis::Vcs::Git::top
     end
 
     module_function :top
 
     class << self
       def version
         return @version if @version
-        @version ||= `git describe --always --dirty --tags 2>/dev/null`.strip
+        @version ||= ::Travis::Vcs::Git::version
         @version = nil unless $?.success?
         @version ||= ENV.fetch('BUILD_SLUG_COMMIT', nil)
         @version ||= top.join('VERSION').read if top.join('VERSION').exist?

lib/travis/build/addons/artifacts/env.rb

@@ -1,13 +1,14 @@
 require 'core_ext/hash/deep_symbolize_keys'
 require 'active_support/core_ext/hash/slice'
+require 'travis/vcs.rb'
 
 module Travis
   module Build
     class Addons
       class Artifacts < Base
         class Env
           DEFAULT = {
-            paths: '$(git ls-files -o | tr "\n" ":")',
+            paths: ::Travis::Vcs::paths,
             log_format: 'multiline'
           }
 

lib/travis/build/addons/chrome.rb

@@ -60,9 +60,9 @@ def export_source_url
             sh.elif "$(uname) = 'Darwin'" do
               case version
               when 'stable'
-                pkg_url = "https://dl.google.com/chrome/mac/stable/GGRO/googlechrome.dmg"
+                pkg_url = "https://dl.google.com/chrome/mac/universal/stable/GGRO/googlechrome.dmg"
               when 'beta'
-                pkg_url = "https://dl.google.com/chrome/mac/beta/googlechrome.dmg"
+                pkg_url = "https://dl.google.com/chrome/mac/universal/beta/googlechromebeta.dmg "
               end
               sh.export 'CHROME_SOURCE_URL', pkg_url
             end

lib/travis/build/addons/deploy/script.rb

@@ -267,10 +267,10 @@ def build_gem_locally_from(source, branch)
               sh.echo "Building dpl gem locally with source #{source} and branch #{branch}", ansi: :yellow
               cmd("gem uninstall -aIx dpl >& /dev/null",                echo: false, assert: !allow_failure, timing: false)
               sh.cmd("pushd /tmp >& /dev/null",                             echo: false, assert: !allow_failure, timing: true)
-              sh.cmd("git clone https://github.com/#{source} #{source}",    echo: true,  assert: !allow_failure, timing: true)
+              sh.cmd(::Travis::Vcs::Git::clone_cmd('https://github.com',source),    echo: true,  assert: !allow_failure, timing: true)
               sh.cmd("pushd #{source} >& /dev/null",                        echo: false, assert: !allow_failure, timing: true)
-              sh.cmd("git checkout #{branch}",                              echo: true,  assert: !allow_failure, timing: true)
-              sh.cmd("git rev-parse HEAD",                                echo: true,  assert: !allow_failure, timing: true)
+              sh.cmd(::Travis::Vcs::Git::checkout_cmd(branch),                              echo: true,  assert: !allow_failure, timing: true)
+              sh.cmd(::Travis::Vcs::Git::revision_cmd,                                echo: true,  assert: !allow_failure, timing: true)
               cmd("gem build dpl.gemspec",                                  echo: true,  assert: !allow_failure, timing: true)
               sh.raw "for f in dpl-*.gemspec; do"
               sh.raw "  base=${f%*.gemspec}"

lib/travis/build/appliances/agent.rb

@@ -1,7 +1,6 @@
 require 'base64'
 require 'travis/build/appliances/base'
 require 'travis/build/appliances/agent/jwt'
-require 'travis/build/git'
 
 module Travis
   module Build

lib/travis/build/appliances/checkout.rb

@@ -1,12 +1,12 @@
 require 'travis/build/appliances/base'
-require 'travis/build/git'
+require 'travis/vcs'
 
 module Travis
   module Build
     module Appliances
       class Checkout < Base
         def apply
-          Git.new(sh, data).checkout
+          Travis::Vcs.checkout(sh, data)
         end
 
         def apply?

lib/travis/build/appliances/rm_etc_boto_cfg.rb

@@ -1,5 +1,4 @@
 require 'travis/build/appliances/base'
-require 'travis/build/git'
 
 module Travis
   module Build

lib/travis/build/appliances/setup_filter.rb

@@ -1,5 +1,4 @@
 require 'travis/build/appliances/base'
-require 'travis/build/git'
 require 'travis/rollout'
 
 module Travis

lib/travis/build/bash/travis_install_jdk.bash

@@ -27,7 +27,7 @@ travis_install_jdk_ext_provider() {
   mkdir -p ~/bin
   url="https://$TRAVIS_APP_HOST/files/install-jdk.sh"
   if ! travis_download "$url" ~/bin/install-jdk.sh; then
-    url="https://raw.githubusercontent.com/sormuras/bach/master/install-jdk.sh"
+    url="https://raw.githubusercontent.com/sormuras/bach/releases/11/install-jdk.sh"
     travis_download "$url" ~/bin/install-jdk.sh || {
       echo "${ANSI_RED}Could not acquire install-jdk.sh. Stopping build.${ANSI_RESET}" >/dev/stderr
       travis_terminate 2

lib/travis/build/errors.rb

@@ -89,5 +89,11 @@ def initialize(msg = "Unable to fetch GitHub Apps Token. GitHub may be unavailab
         super
       end
     end
+
+    class UnknownServiceTypeError < StandardError
+      def initialize(_type)
+        super
+      end
+    end
   end
 end