Skip to content

[4.x] use docker healthcmd #368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
heelc29 wants to merge 2 commits into
base: 4.x-dev
Choose a base branch
from
Open

[4.x] use docker healthcmd #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63d68bb
use docker healthcmd
heelc29 Jul 6, 2026
1f04146
Merge branch '4.x-dev' into 4.x/ci-healthcmd
heelc29 Jul 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@ jobs:
MYSQL_PASSWORD: joomla_ut
MYSQL_ROOT_PASSWORD: joomla_ut
MYSQL_DATABASE: joomla_ut
options: >-
--health-cmd="mysqladmin ping -h localhost -u joomla_ut -pjoomla_ut"

tests-unit-mariadb:
name: Run Unit tests on MariaDB
Expand All @@ -125,6 +127,8 @@ jobs:
MARIADB_PASSWORD: joomla_ut
MARIADB_ROOT_PASSWORD: joomla_ut
MARIADB_DATABASE: joomla_ut
options: >-
--health-cmd="healthcheck.sh --connect --innodb_initialized"

tests-unit-postgres:
name: Run Unit tests on PostgreSQL
Expand All @@ -148,7 +152,9 @@ jobs:
env:
POSTGRES_USER: root
POSTGRES_PASSWORD: joomla_ut
POSTGRES_DB: test_joomla
POSTGRES_DB: joomla_ut
options: >-
--health-cmd="pg_isready -d joomla_ut"

tests-unit-sqlsrv:
name: Run Unit tests on SQLsrv
Expand Down Expand Up @@ -181,6 +187,8 @@ jobs:
ACCEPT_EULA: Y
MSSQL_SA_PASSWORD: Password12!
MSSQL_PID: Developer
options: >-
--health-cmd="bash -c 'SQLCMD=$(command -v /opt/mssql-tools/bin/sqlcmd || command -v /opt/mssql-tools18/bin/sqlcmd); [ -z \"$SQLCMD\" ] && exit 1; $SQLCMD -S localhost -U sa -P Password12! -C -Q SELECT\ 1'"

tests-unit-windows:
name: Run Unit tests on MSSQL (Windows)
Expand Down
3 changes: 0 additions & 3 deletions Tests/Mysql/MysqlDriverTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,6 @@ class MysqlDriverTest extends AbstractDatabaseDriverTestCase
*/
public static function setUpBeforeClass(): void
{
// Give the container a chance to get ready
sleep(20);

parent::setUpBeforeClass();

if (!static::$connection || static::$connection->getName() !== 'mysql') {
Expand Down
8 changes: 0 additions & 8 deletions Tests/Mysqli/MysqliDriverTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
namespace Joomla\Database\Tests\Mysqli;

use Joomla\Database\DatabaseDriver;
use Joomla\Database\DatabaseFactory;
use Joomla\Database\Exception\ExecutionFailureException;
use Joomla\Database\Mysqli\MysqliDriver;
use Joomla\Database\Mysqli\MysqliExporter;
Expand Down Expand Up @@ -37,13 +36,6 @@ class MysqliDriverTest extends AbstractDatabaseDriverTestCase
*/
public static function setUpBeforeClass(): void
{
$host = getenv('JOOMLA_TEST_DB_HOST');
$port = getenv('JOOMLA_TEST_DB_PORT') ?: 3306;

/** @var MysqliDriver $mysqli */
$mysqli = (new DatabaseFactory())->getDriver('mysqli');
$mysqli->healthCheck($host, $port, 10, 10, 1, 10);

parent::setUpBeforeClass();

if (!static::$connection || static::$connection->getName() !== 'mysqli') {
Expand Down
3 changes: 0 additions & 3 deletions Tests/Pgsql/PgsqlDriverTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@ class PgsqlDriverTest extends AbstractDatabaseDriverTestCase
*/
public static function setUpBeforeClass(): void
{
// Give the container a chance to get ready
sleep(20);

parent::setUpBeforeClass();

if (!static::$connection || static::$connection->getName() !== 'pgsql') {
Expand Down
3 changes: 0 additions & 3 deletions Tests/Sqlsrv/SqlsrvDriverTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@ class SqlsrvDriverTest extends AbstractDatabaseDriverTestCase
*/
public static function setUpBeforeClass(): void
{
// Give the container a chance to get ready
sleep(20);

parent::setUpBeforeClass();

if (!static::$connection || static::$connection->getName() !== 'sqlsrv') {
Expand Down
Loading