Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

.travis.yml changes

Browse source
This commit is contained in:
André Bauer 2016-10-24 12:42:07 +02:00
parent 78059397d1
commit dc1559c7b8
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.travis.yml
View file

@ -14,8 +14,8 @@ rvm:
before_install:
- 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
- mysql -u root -e 'CREATE USER "some_user"@"localhost" IDENTIFIED BY "some_pass";'
- mysql -u root -e 'GRANT ALL PRIVILEGES ON zammad_prod.* TO "some_user"@"localhost";'
- mysql -u root -e "CREATE USER 'some_user'@'localhost' IDENTIFIED BY 'some_pass';"
- mysql -u root -e "GRANT ALL PRIVILEGES ON zammad_prod.* TO 'some_user'@'localhost';"
- export RAILS_ENV=production
- cp config/database.yml.dist config/database.yml
install:

4
config/initializers/db_preferences_mysql.rb
View file

@ -24,7 +24,8 @@ if ActiveRecord::Base.connection_config[:adapter] == 'mysql2'
# rubocop:enable Rails/Exit
# rubocop:enable Rails/Output
end
elsif major.to_i < 10
elsif server_vendor == 'MariaDB'
if major.to_i < 10
# rubocop:disable Rails/Output
# rubocop:disable Rails/Exit
@ -34,6 +35,5 @@ if ActiveRecord::Base.connection_config[:adapter] == 'mysql2'
exit 1
# rubocop:enable Rails/Exit
# rubocop:enable Rails/Output
end
end