Skip to content

Commit d1a9999

Browse files
Merge pull request #737 from travis-ci/bionic-updates
Bionic updates
2 parents 92f5ff7 + e638386 commit d1a9999

File tree

6 files changed

+53
-23
lines changed

6 files changed

+53
-23
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ install:
3131
- rvm use 2.5.3 --install --binary --fuzzy
3232
- gem install bundler:1.17.1
3333
- gem update --system
34+
- gem install bundler:1.17.1
3435
- bundle install --jobs=3 --retry=2 --path=vendor/bundle
3536
- ./bin/packer-build-install
3637
- ln -sv "${TRAVIS_BUILD_DIR}" "${TRAVIS_BUILD_DIR}/tmp/packer-chef-local"

ci-ubuntu-1804.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ builders:
2525
image_licenses: ["projects/vm-options/global/licenses/enable-vmx"]
2626
zone: us-central1-a
2727
image_name: "{{ user `image_name` }}"
28-
machine_type: n1-standard-4
29-
disk_size: 15
28+
machine_type: n2-standard-4
29+
disk_size: 40
3030
tags:
3131
- ci
3232
- ubuntu-1804

cookbooks/lib/features/basic_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ def hg_project
450450
end
451451

452452
describe command('psql --version') do
453-
its(:stdout) { should match(/^psql.+(9\.[4-6]+\.[0-9]+|10\.[0-9])/) }
453+
its(:stdout) { should match(/^psql.+(9\.[4-6]+\.[0-9]+|10\.[0-9]{1,2}|11\.[0-9]{1,2})/) }
454454
its(:exit_status) { should eq 0 }
455455
end
456456

cookbooks/lib/features/elasticsearch_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# frozen_string_literal: true
22

33
def db_url
4-
'http://localhost:9200/travis'
4+
'http://0.0.0.0:9200/travis'
55
end
66

77
describe 'elasticsearch installation', sudo: true do
@@ -12,7 +12,7 @@ def db_url
1212
before :all do
1313
sh('sudo service elasticsearch restart')
1414
sleep 5
15-
tcpwait('localhost', 9200, 30)
15+
tcpwait('0.0.0.0', 9200, 30)
1616
sh(%(curl -H "Content-Type: application/json" -X PUT "#{db_url}/user/koopa93" -d "{
1717
\"name\": \"Shy Bowser\"
1818
}"

cookbooks/lib/languages/python_spec.rb

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,10 @@
3939
end
4040

4141
{
42-
'python2.7' => '2.7.15',
43-
'python3.6' => '3.6.7',
44-
'python3.7' => '3.7.1'
42+
'python2.7' => '2.7.17',
43+
'python3.6' => '3.6.10',
44+
'python3.7' => '3.7.6',
45+
'python3.8' => '3.8.1'
4546
}.each do |python_alias, python_version|
4647
describe pycommand('python -m this', version: python_alias), dev: true do
4748
its(:stderr) { should be_empty }

cookbooks/travis_ci_ubuntu_1804/attributes/default.rb

Lines changed: 43 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,18 @@
55
'/var/tmp/ubuntu-1804-system-info-commands.yml'
66
override['travis_build_environment']['system_python']['pythons'] = %w[2.7 3.6]
77
override['travis_build_environment']['python_aliases'] = {
8-
'2.7.15' => %w[2.7],
9-
'3.6.7' => %w[3.6],
8+
'2.7.17' => %w[2.7],
9+
'3.6.10' => %w[3.6],
10+
'3.7.6' => %w[3.7],
11+
'3.8.1' => %w[3.8],
1012
'pypy2.7-5.8.0' => %w[pypy],
1113
'pypy3.5-5.8.0' => %w[pypy3]
1214
}
1315
php_aliases = {
14-
'7.1' => '7.1.30',
15-
'7.2' => '7.2.19',
16-
'7.3' => '7.3.6'
16+
'7.1' => '7.1.33',
17+
'7.2' => '7.2.27',
18+
'7.3' => '7.3.14',
19+
'7.4' => '7.4.2'
1720
}
1821
override['travis_build_environment']['php_versions'] = php_aliases.values
1922
override['travis_build_environment']['php_default_version'] = php_aliases['7.2']
@@ -29,8 +32,26 @@
2932
override['travis_build_environment']['hhvm_enabled'] = false
3033
end
3134

32-
override['travis_perlbrew']['perls'] = []
33-
override['travis_perlbrew']['modules'] = []
35+
override['travis_perlbrew']['perls'] = [
36+
{ name: '5.26', version: 'perl-5.26.2' },
37+
{ name: '5.26-extras', version: 'perl-5.26.2',
38+
arguments: '-Duseshrplib -Duseithreads', alias: '5.26-shrplib' },
39+
{ name: '5.24', version: 'perl-5.24.0' },
40+
{ name: '5.24-extras', version: 'perl-5.24.0',
41+
arguments: '-Duseshrplib -Duseithreads', alias: '5.24-shrplib' }
42+
]
43+
override['travis_perlbrew']['modules'] = %w[
44+
Dist::Zilla
45+
Dist::Zilla::Plugin::Bootstrap::lib
46+
ExtUtils::MakeMaker
47+
LWP
48+
Module::Install
49+
Moose
50+
Test::Exception
51+
Test::Most
52+
Test::Pod
53+
Test::Pod::Coverage
54+
]
3455
override['travis_perlbrew']['prerequisite_packages'] = []
3556

3657
gimme_versions = %w[
@@ -55,15 +76,19 @@
5576
override['leiningen']['user'] = 'travis'
5677

5778
override['travis_build_environment']['nodejs_versions'] = %w[
58-
12.7.0
5979
10.16.0
80+
13.3.0
81+
12.13.1
82+
11.15.0
83+
8.16.2
6084
]
6185
override['travis_build_environment']['nodejs_default'] = '10.16.0'
6286

6387
pythons = %w[
64-
2.7.15
65-
3.6.7
66-
3.7.1
88+
2.7.17
89+
3.6.10
90+
3.7.6
91+
3.8.1
6792
]
6893

6994
# Reorder pythons so that default python2 and python3 come first
@@ -87,13 +112,14 @@ def python_aliases(full_name)
87112
end
88113

89114
rubies = %w[
90-
2.4.5
115+
2.4.9
91116
2.5.3
92-
2.6.3
117+
2.5.7
93118
2.7.0
119+
2.6.5
94120
]
95121

96-
override['travis_build_environment']['default_ruby'] = rubies.reject { |n| n =~ /jruby/ }.max
122+
override['travis_build_environment']['default_ruby'] = rubies.reject { |n| n =~ /jruby/ }.last
97123
override['travis_build_environment']['rubies'] = rubies
98124

99125
override['travis_build_environment']['otp_releases'] = []
@@ -110,7 +136,7 @@ def python_aliases(full_name)
110136
override['travis_packer_templates']['job_board']['stack'] = 'ubuntu_1804'
111137

112138
override['travis_postgresql']['default_version'] = '9.3'
113-
override['travis_postgresql']['alternate_versions'] = %w[9.4 9.5 9.6 10]
139+
override['travis_postgresql']['alternate_versions'] = %w[9.4 9.5 9.6 10 11]
114140
override['travis_postgresql']['enabled'] = false # is default instance started on machine boot?
115141

116142
override['travis_packer_templates']['job_board']['features'] = %w[
@@ -157,4 +183,6 @@ def python_aliases(full_name)
157183
ruby
158184
scala
159185
julia
186+
perl
187+
perl6
160188
]

0 commit comments

Comments
 (0)