fix: bump pskel 3.1.2 (#31)

* fix: bump pskel 3.1.2

* fix

* fix

* increase attempt

Author: zeriyoshi

.github/workflows/ci_coverage.yaml

@@ -88,6 +88,7 @@ jobs:
         run: |
           docker compose build \
             --build-arg TAG="${{ matrix.versions }}-${{ matrix.ts }}" \
+            --build-arg SKIP_VALGRIND=1 \
             shell
           touch "lcov.info"
           docker compose run -v "$(pwd)/lcov.info:/ext/lcov.info" --rm shell pskel coverage

.github/workflows/ci_native_linux.yaml

@@ -66,7 +66,7 @@ jobs:
         if: matrix.version != '8.1'
         run: docker compose run --rm -v "$(pwd)/php-cache:/opt/php-cache" -e PHP_CACHE_DIR="/opt/php-cache" -e GITHUB_ACTIONS="true" -e CONTAINER_IMAGE_HASH="${{ steps.pull-image.outputs.image_hash }}" shell pskel test debug
       - name: Test extension with Valgrind
-        if: matrix.version != '8.1'
+        if: matrix.distro != 'alpine' && matrix.version != '8.1'
         run: docker compose run --rm -v "$(pwd)/php-cache:/opt/php-cache" -e PHP_CACHE_DIR="/opt/php-cache" -e GITHUB_ACTIONS="true" -e CONTAINER_IMAGE_HASH="${{ steps.pull-image.outputs.image_hash }}" shell pskel test valgrind
       - name: Test extension with LLVM Sanitizer (MemorySanitizer)
         if: matrix.distro != 'alpine' && matrix.version != '8.1'

.github/workflows/ci_prepare.yaml

@@ -12,7 +12,6 @@ on:
       archive_name:
         description: Name of the tar.gz workspace archive
         value: ${{ jobs.prepare.outputs.archive_name }}
-
 jobs:
   prepare:
     runs-on: ubuntu-24.04

Dockerfile

@@ -49,7 +49,7 @@ RUN docker-php-source extract \
 
 COPY ./third_party/valgrind "/third_party/valgrind"
 ARG SKIP_VALGRIND
-RUN if test "${SKIP_VALGRIND}" != "1"; then \
+RUN if test "${SKIP_VALGRIND}" != "1" && test -f "/etc/debian_version"; then \
       cd "/third_party/valgrind" && \
         if test -f "/etc/debian_version"; then \
           apt-get update && \

ext/tests/classes/pdo/mysql/exec_doer.phpt

@@ -16,7 +16,21 @@ $before = new \DateTimeImmutable();
 
 \Colopl\ColoplTimeShifter\register_hook($shift_interval);
 
-$pdo = new \PDO('mysql:dbname=testing;host=mysql', 'testing', 'testing');
+$pdo = (static function () {
+    $attempt = 0;
+    $delay = 100000;
+    while (true) {
+        try {
+            return new \PDO('mysql:dbname=testing;host=mysql', 'testing', 'testing');
+        } catch (\PDOException $exception) {
+            if (++$attempt >= 10) {
+                throw $exception;
+            }
+        }
+        usleep($delay);
+        $delay *= 2;
+    }
+})();
 
 $pdo->exec('DROP TABLE IF EXISTS testing;');
 $pdo->exec('CREATE TABLE IF NOT EXISTS testing (

ext/tests/classes/pdo/mysql/exec_doer_tidb.phpt

@@ -14,7 +14,21 @@ $before = new \DateTimeImmutable();
 
 \Colopl\ColoplTimeShifter\register_hook($shift_interval);
 
-$pdo = new \PDO('mysql:dbname=mysql;host=tidb;port=4000', 'root', '');
+$pdo = (static function () {
+    $attempt = 0;
+    $delay = 100000;
+    while (true) {
+        try {
+            return new \PDO('mysql:dbname=mysql;host=tidb;port=4000', 'root', '');
+        } catch (\PDOException $exception) {
+            if (++$attempt >= 10) {
+                throw $exception;
+            }
+        }
+        usleep($delay);
+        $delay *= 2;
+    }
+})();
 
 $pdo->exec('CREATE DATABASE IF NOT EXISTS testing;');
 $pdo->exec('USE testing;');

ext/tests/classes/pdo/mysql/query_preparer.phpt

@@ -16,7 +16,21 @@ $before = new \DateTimeImmutable();
 
 \Colopl\ColoplTimeShifter\register_hook($shift_interval);
 
-$pdo = new \PDO('mysql:host=mysql', 'testing', 'testing');
+$pdo = (static function () {
+    $attempt = 0;
+    $delay = 100000;
+    while (true) {
+        try {
+            return new \PDO('mysql:host=mysql', 'testing', 'testing');
+        } catch (\PDOException $exception) {
+            if (++$attempt >= 10) {
+                throw $exception;
+            }
+        }
+        usleep($delay);
+        $delay *= 2;
+    }
+})();
 
 /* NOW(), CURRENT_TIMESTAMP, CURRENT_TIMESTAMP(), UTC_TIMESTAMP() */
 foreach ($pdo->query('

ext/tests/classes/pdo/mysql/query_preparer_tidb.phpt

@@ -14,7 +14,21 @@ $before = new \DateTimeImmutable();
 
 \Colopl\ColoplTimeShifter\register_hook($shift_interval);
 
-$pdo = new \PDO('mysql:dbname=mysql;host=tidb;port=4000', 'root', '');
+$pdo = (static function () {
+    $attempt = 0;
+    $delay = 100000;
+    while (true) {
+        try {
+            return new \PDO('mysql:dbname=mysql;host=tidb;port=4000', 'root', '');
+        } catch (\PDOException $exception) {
+            if (++$attempt >= 10) {
+                throw $exception;
+            }
+        }
+        usleep($delay);
+        $delay *= 2;
+    }
+})();
 $pdo->exec('CREATE DATABASE IF NOT EXISTS testing;');
 $pdo->exec('USE testing;');