Skip to content

Commit bcd1419

Browse files
committed
build: Change Travis postgres user "root" back to "travis"
Follows-up 5168cb6, in which we moved from Precise vms to Trusty vms. As a side-effect, the undocumented behaviour of the mysql user "travis" having create-db rights was no longer. As such, we changed it to "root", per <https://docs.travis-ci.com/user/database-setup/>. However, this broke Postgres builds since those should still use "travis". There is no user named "root" for postgres. * Add 'dbuser' to the matrix environment. * Improve inline documentation. Bug: T75176 Change-Id: I09fc0a1da8737e71b3d2b4b88d72b58c150519c4
1 parent 74c02a0 commit bcd1419

File tree

1 file changed

+16
-9
lines changed

1 file changed

+16
-9
lines changed

.travis.yml

+16-9
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,30 @@
77
# complement that setup by testing MediaWiki on travis
88
#
99
language: php
10-
# Using HHVM-3.6+ requires Trusty (Travis default: precise)
11-
# https://docs.travis-ci.com/user/languages/php#HHVM-versions
12-
# https://github.com/travis-ci/travis-ci/issues/7368
10+
# Use the slower sudo-enabled VMs instead of fast containers:
11+
# - Package 'djvulibre-bin' is not yet whitelisted for trusty containers.
12+
# https://github.com/travis-ci/apt-package-whitelist/issues/4036
1313
sudo: required
1414
group: edge
15+
# Use Trusty instead of Travis default (precise)
16+
# - Required in order to use HHVM 3.6 or higher.
17+
# - Required for non-buggy xml library for XmlTypeCheck/UploadBaseTest (T75176).
1518
dist: trusty
1619

1720
matrix:
1821
fast_finish: true
1922
include:
20-
- env: dbtype=mysql
23+
# On Trusty, mysql user 'travis' doesn't have create database rights
24+
# Postgres has no user called 'root'.
25+
- env: dbtype=mysql dbuser=root
2126
php: 5.5
22-
- env: dbtype=postgres
27+
- env: dbtype=postgres dbuser=travis
2328
php: 5.5
24-
- env: dbtype=mysql
29+
- env: dbtype=mysql dbuser=root
30+
# https://docs.travis-ci.com/user/languages/php#HHVM-versions
31+
# https://github.com/travis-ci/travis-ci/issues/7368
2532
php: hhvm-3.12
26-
- env: dbtype=mysql
33+
- env: dbtype=mysql dbuser=root
2734
php: 7
2835

2936
services:
@@ -32,7 +39,7 @@ services:
3239
branches:
3340
# Test changes in master and arbitrary Travis CI branches only.
3441
# The latter allows developers to enable Travis CI in their GitHub fork of
35-
# wikimedia/mediawiki and then push changes they like to test to branches like
42+
# wikimedia/mediawiki and then push changes for testing to branches like
3643
# "travis-ci/test-this-awesome-change".
3744
only:
3845
- master
@@ -50,7 +57,7 @@ before_script:
5057
--pass travis
5158
--dbtype "$dbtype"
5259
--dbname traviswiki
53-
--dbuser root
60+
--dbuser "$dbuser"
5461
--dbpass ""
5562
--scriptpath "/w"
5663

0 commit comments

Comments
 (0)