Merge pull request #1900 from zammad/revert-1899-bugfix/travis-build

Revert "Fix Travis CI build failures (by switching to containerized CI environment)"
This commit is contained in:
André Bauer 2018-03-25 00:13:23 +01:00 committed by GitHub
commit 8978e74355
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,5 +1,6 @@
dist: trusty
sudo: false
sudo: required
group: deprecated
notifications:
email:
- me+tv@zammad.com
@ -10,31 +11,6 @@ addons:
postgresql: "9.4"
apt:
packages:
- curl
- git-core
- patch
- build-essential
- bison
- zlib1g-dev
- libssl-dev
- libxml2-dev
- sqlite3
- libsqlite3-dev
- autotools-dev
- libxslt1-dev
- libyaml-0-2
- autoconf
- automake
- libreadline6-dev
- libyaml-dev
- libtool
- libgmp-dev
- libgdbm-dev
- libncurses5-dev
- pkg-config
- libffi-dev
- libmysqlclient-dev
- postfix
- mysql-server-5.6
- mysql-client-core-5.6
- mysql-client-5.6
@ -46,6 +22,8 @@ rvm:
- 2.4.2
before_install:
- git fetch --unshallow
- sudo apt-get -qq update
- sudo apt-get install -y curl git-core patch build-essential bison zlib1g-dev libssl-dev libxml2-dev libxml2-dev sqlite3 libsqlite3-dev autotools-dev libxslt1-dev libyaml-0-2 autoconf automake libreadline6-dev libyaml-dev libtool libgmp-dev libgdbm-dev libncurses5-dev pkg-config libffi-dev libmysqlclient-dev postfix
- if [ "${DB}" = "mysql" ]; then mysql -u root -e "CREATE USER 'some_user'@'localhost' IDENTIFIED BY 'some_pass';"; fi
- if [ "${DB}" = "mysql" ]; then mysql -u root -e "GRANT ALL PRIVILEGES ON *.* TO 'some_user'@'localhost';"; fi
- if [ "${DB}" = "mysql" ]; then cp config/database.yml.test-mysql config/database.yml; fi