From 9be3bcada5484a6e5685d4963948a2e1b213cc5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C5=BEuris?= Date: Mon, 27 May 2024 11:29:03 +0300 Subject: [PATCH] Keep debugging the workflow --- .github/workflows/test.yml | 7 +++++++ tests/Integration/MariaDB/PDOTest.php | 6 +++--- tests/Integration/MySQL/PDOTest.php | 4 ++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 313e75c..4b8cf7f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -47,11 +47,18 @@ jobs: MARIADB_PASSWORD: sfa ports: - 3306:3306 + options: --health-cmd="healthcheck.sh --connect --innodb_initialized" --health-interval=10s --health-timeout=5s --health-retries=3 steps: - name: Checkout code uses: actions/checkout@v4 + - name: HUH? + run: mysql -u sfa -p sfa -h localhost -P 3307 -D sfa -e 'select 1+3;' + + - name: huh? + run: cat healthcheck.sh + - name: Install dependencies uses: ramsey/composer-install@v2 diff --git a/tests/Integration/MariaDB/PDOTest.php b/tests/Integration/MariaDB/PDOTest.php index ab31293..e76d729 100644 --- a/tests/Integration/MariaDB/PDOTest.php +++ b/tests/Integration/MariaDB/PDOTest.php @@ -17,7 +17,7 @@ protected function setUp(): void { parent::setUp(); - $dsn = "mysql:host=localhost;port=3307;dbname=sfa;"; + $dsn = "mysql:host=127.0.0.1;port=3306;dbname=sfa;"; $this->pdo = new PDO($dsn, 'sfa', 'sfa', options: [ PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION, @@ -42,8 +42,8 @@ public function testComplexActions(): void { // Let's try various APIs $points = [ - Sfc::makePoint(0, 0), - new Point('ST_MakePoint(?, ?)', [0, 10]), + Sfc::point(0, 0), + new Point('POINT(?, ?)', [0, 10]), new Geometry("'POINT(5 5)'::geometry"), ]; diff --git a/tests/Integration/MySQL/PDOTest.php b/tests/Integration/MySQL/PDOTest.php index c94c332..83ee219 100644 --- a/tests/Integration/MySQL/PDOTest.php +++ b/tests/Integration/MySQL/PDOTest.php @@ -42,8 +42,8 @@ public function testComplexActions(): void { // Let's try various APIs $points = [ - Sfc::makePoint(0, 0), - new Point('ST_MakePoint(?, ?)', [0, 10]), + Sfc::point(0, 0), + new Point('POINT(?, ?)', [0, 10]), new Geometry("'POINT(5 5)'::geometry"), ];