From 09777e21ae3db0289f7ef3a20d4f0d0070f2bd01 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Mon, 20 Nov 2023 17:13:05 +0000 Subject: [PATCH] Merged r22468 to r22470 from trunk. git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@22471 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/tasks/ci.rake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/tasks/ci.rake b/lib/tasks/ci.rake index 8c7f8b68f..9800c226e 100644 --- a/lib/tasks/ci.rake +++ b/lib/tasks/ci.rake @@ -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 -- 2.39.5