Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-07-06 16:09:07 +02:00
Code Issues Packages Projects Releases Activity

Merged r22468 to r22470 from trunk.

Browse Source 
git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@22471 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2023-11-20 17:13:05 +00:00
parent 6629fd6f3c
commit 09777e21ae
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/tasks/ci.rake
View File

@@ -58,8 +58,9 @@ file 'config/database.yml' do
case database
when /(mysql|mariadb)/
dev_conf = {'adapter' => 'mysql2',
'database' => dev_db_name, 'host' => 'localhost',
'encoding' => 'utf8'}
'database' => dev_db_name, 'host' => (ENV['CI_MYSQL_HOST'] || 'localhost'),
'encoding' => 'utf8',
'ssl_mode' => 'disabled'}
if ENV['RUN_ON_NOT_OFFICIAL']
dev_conf['username'] = 'root'
else
@@ -69,7 +70,7 @@ file 'config/database.yml' do
test_conf = dev_conf.merge('database' => test_db_name)
when /postgresql/
dev_conf = {'adapter' => 'postgresql', 'database' => dev_db_name,
'host' => 'localhost'}
'host' => (ENV['CI_PG_HOST'] || 'localhost')}
if ENV['RUN_ON_NOT_OFFICIAL']
dev_conf['username'] = 'postgres'
else