Merge branch 'master' into rhel8

Author: GbArc

init.rb

@@ -74,7 +74,7 @@ def data
         end
 
         def set_up_config(match_data)
-          @build = build(match_data[:build])
+          @build = build(match_data[:build].to_i)
           @job_number = match_data[:job].to_i - 1
           @compile_config = @build.jobs[@job_number].config
         end

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/apt.rb

@@ -15,6 +15,7 @@ class Apt < Base
           xenial
           bionic
           focal
+          jammy
         ).freeze
 
         attr_reader :safelisted, :disallowed_while_sudo

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/addons/mariadb.rb

@@ -21,7 +21,7 @@ def after_prepare
             sh.else do
               sh.cmd "apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 #{MARIADB_GPG_KEY_NEW}", sudo: true
             end
-            sh.cmd 'add-apt-repository "deb http://%p/mariadb/repo/%p/ubuntu $TRAVIS_DIST main"' % [MARIADB_MIRROR, mariadb_version], sudo: true
+            sh.cmd 'add-apt-repository --yes "deb http://%p/mariadb/repo/%p/ubuntu $TRAVIS_DIST main"' % [MARIADB_MIRROR, mariadb_version], sudo: true
             sh.cmd 'travis_apt_get_update', retry: true, echo: true
             sh.cmd "PACKAGES='mariadb-server-#{mariadb_version}'", echo: true
             sh.cmd "if [[ $(lsb_release -cs) = 'precise' ]]; then PACKAGES=\"${PACKAGES} libmariadbclient-dev\"; fi", echo: true

lib/travis/build/addons/snaps.rb

@@ -13,6 +13,7 @@ class Snaps < Base
           xenial
           bionic
           focal
+          jammy
         ).freeze
 
         def before_prepare?

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?