Skip to content

Commit 4951451

Browse files
GbArcGbArc
committed
Merge branch 'master' into ga-tproxy_assembla
2 parents eb1bb02 + b26cf70 commit 4951451

File tree

7 files changed

+23
-19
lines changed

7 files changed

+23
-19
lines changed

‎lib/travis/build/addons/apt.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ class Apt < Base
1515
xenial
1616
bionic
1717
focal
18+
jammy
1819
).freeze
1920

2021
attr_reader :safelisted, :disallowed_while_sudo

‎lib/travis/build/addons/mariadb.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def after_prepare
2121
sh.else do
2222
sh.cmd "apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 #{MARIADB_GPG_KEY_NEW}", sudo: true
2323
end
24-
sh.cmd 'add-apt-repository "deb http://%p/mariadb/repo/%p/ubuntu $TRAVIS_DIST main"' % [MARIADB_MIRROR, mariadb_version], sudo: true
24+
sh.cmd 'add-apt-repository --yes "deb http://%p/mariadb/repo/%p/ubuntu $TRAVIS_DIST main"' % [MARIADB_MIRROR, mariadb_version], sudo: true
2525
sh.cmd 'travis_apt_get_update', retry: true, echo: true
2626
sh.cmd "PACKAGES='mariadb-server-#{mariadb_version}'", echo: true
2727
sh.cmd "if [[ $(lsb_release -cs) = 'precise' ]]; then PACKAGES=\"${PACKAGES} libmariadbclient-dev\"; fi", echo: true

‎lib/travis/build/addons/snaps.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ class Snaps < Base
1313
xenial
1414
bionic
1515
focal
16+
jammy
1617
).freeze
1718

1819
def before_prepare?

‎lib/travis/build/config.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ def sc_data
5353
xenial: ENV.fetch('TRAVIS_BUILD_APT_PACKAGE_SAFELIST_XENIAL', ''),
5454
bionic: ENV.fetch('TRAVIS_BUILD_APT_PACKAGE_SAFELIST_BIONIC', ''),
5555
focal: ENV.fetch('TRAVIS_BUILD_APT_PACKAGE_SAFELIST_FOCAL', ''),
56+
jammy: ENV.fetch('TRAVIS_BUILD_APT_PACKAGE_SAFELIST_JAMMY', ''),
5657
},
5758
apt_proxy: ENV.fetch('TRAVIS_BUILD_APT_PROXY', ''),
5859
apt_source_alias_list: {
@@ -61,6 +62,7 @@ def sc_data
6162
xenial: ENV.fetch('TRAVIS_BUILD_APT_SOURCE_ALIAS_LIST_XENIAL', ''),
6263
bionic: ENV.fetch('TRAVIS_BUILD_APT_SOURCE_ALIAS_LIST_BIONIC', ''),
6364
focal: ENV.fetch('TRAVIS_BUILD_APT_SOURCE_ALIAS_LIST_FOCAL', ''),
65+
jammy: ENV.fetch('TRAVIS_BUILD_APT_SOURCE_ALIAS_LIST_JAMMY', ''),
6466
},
6567
apt_source_alias_list_key_url_template: ENV.fetch(
6668
'TRAVIS_BUILD_APT_SOURCE_ALIAS_LIST_KEY_URL_TEMPLATE',

‎lib/travis/build/script/php.rb

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -221,23 +221,23 @@ def php_5_3_or_older?
221221
def overwrite_pearrc(version)
222222
pear_config = %q(
223223
[
224-
'preferred_state' => "stable",
225-
'temp_dir' => "/tmp/pear/install",
226-
'download_dir' => "/tmp/pear/install",
227-
'bin_dir' => "/home/travis/.phpenv/versions/__VERSION__/bin",
228-
'php_dir' => "/home/travis/.phpenv/versions/__VERSION__/share/pear",
229-
'doc_dir' => "/home/travis/.phpenv/versions/__VERSION__/docs",
230-
'data_dir' => "/home/travis/.phpenv/versions/__VERSION__/data",
231-
'cfg_dir' => "/home/travis/.phpenv/versions/__VERSION__/cfg",
232-
'www_dir' => "/home/travis/.phpenv/versions/__VERSION__/www",
233-
'man_dir' => "/home/travis/.phpenv/versions/__VERSION__/man",
234-
'test_dir' => "/home/travis/.phpenv/versions/__VERSION__/tests",
235-
'__channels' => [
236-
'__uri' => [],
237-
'doc.php.net' => [],
238-
'pecl.php.net' => []
224+
"preferred_state" => "stable",
225+
"temp_dir" => "/tmp/pear/install",
226+
"download_dir" => "/tmp/pear/install",
227+
"bin_dir" => "/home/travis/.phpenv/versions/__VERSION__/bin",
228+
"php_dir" => "/home/travis/.phpenv/versions/__VERSION__/share/pear",
229+
"doc_dir" => "/home/travis/.phpenv/versions/__VERSION__/docs",
230+
"data_dir" => "/home/travis/.phpenv/versions/__VERSION__/data",
231+
"cfg_dir" => "/home/travis/.phpenv/versions/__VERSION__/cfg",
232+
"www_dir" => "/home/travis/.phpenv/versions/__VERSION__/www",
233+
"man_dir" => "/home/travis/.phpenv/versions/__VERSION__/man",
234+
"test_dir" => "/home/travis/.phpenv/versions/__VERSION__/tests",
235+
"__channels" => [
236+
"__uri" => [],
237+
"doc.php.net" => [],
238+
"pecl.php.net" => []
239239
],
240-
'auto_discover' => 1
240+
"auto_discover" => 1
241241
]
242242
).gsub("__VERSION__", version)
243243

‎spec/build/addons/apt_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109

110110
it 'defaults source safelist to empty hash' do
111111
expect(described_class.source_alias_lists)
112-
.to eql({ unset: {}, precise: {}, trusty: {}, xenial: {}, bionic: {}, focal: {} })
112+
.to eql({ unset: {}, precise: {}, trusty: {}, xenial: {}, bionic: {}, focal: {}, jammy: {} })
113113
end
114114
end
115115

‎spec/build/addons/mariadb_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
it { should include_sexp [:cmd, "service mysql stop", sudo: true] }
2323
it { should include_sexp [:cmd, "apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 #{Travis::Build::Addons::Mariadb::MARIADB_GPG_KEY_OLD}", sudo: true] }
24-
it { should include_sexp [:cmd, 'add-apt-repository "deb http://%p/mariadb/repo/%p/ubuntu $TRAVIS_DIST main"' % [Travis::Build::Addons::Mariadb::MARIADB_MIRROR, config], sudo: true] }
24+
it { should include_sexp [:cmd, 'add-apt-repository --yes "deb http://%p/mariadb/repo/%p/ubuntu $TRAVIS_DIST main"' % [Travis::Build::Addons::Mariadb::MARIADB_MIRROR, config], sudo: true] }
2525
it { should include_sexp [:cmd, 'travis_apt_get_update', retry: true, echo: true] }
2626
it { should include_sexp [:cmd, "PACKAGES='mariadb-server-10.0'", echo: true] }
2727
it { should include_sexp [:cmd, "rm -rf /var/lib/mysql", sudo: true] }

0 commit comments

Comments
 (0)