ci: fix MySQL and MariaDB wait commands in SQLx workflows

Author: dertin

.github/workflows/sqlx.yml

@@ -446,7 +446,13 @@ jobs:
 
       - run: docker compose -f tests/docker-compose.yml run -d -p 3306:3306 --name mysql_${{ matrix.mysql }} mysql_${{ matrix.mysql }}
       - name: Wait for MySQL
-        run: timeout 60s bash -c 'until docker exec mysql_${{ matrix.mysql }} mysqladmin ping -uroot -ppassword --silent; do sleep 1; done' || (docker logs mysql_${{ matrix.mysql }} && exit 1)
+        run: |
+          docker exec mysql_${{ matrix.mysql }} bash -c '
+            until (command -v mysqladmin >/dev/null && mysqladmin ping -uroot -ppassword --silent) || \
+                  (command -v mariadb-admin >/dev/null && mariadb-admin ping -uroot -ppassword --silent); do
+              sleep 2
+            done
+          '
 
       # Create data dir for offline mode
       - run: mkdir .sqlx
@@ -538,7 +544,12 @@ jobs:
         run: |
           docker stop mysql_${{ matrix.mysql }}
           docker compose -f tests/docker-compose.yml run -d -p 3306:3306 --name mysql_${{ matrix.mysql }}_client_ssl mysql_${{ matrix.mysql }}_client_ssl
-          timeout 60s bash -c 'until docker exec mysql_${{ matrix.mysql }}_client_ssl mysqladmin ping -uroot --silent; do sleep 1; done' || (docker logs mysql_${{ matrix.mysql }}_client_ssl && exit 1)
+          docker exec mysql_${{ matrix.mysql }}_client_ssl bash -c '
+            until (command -v mysqladmin >/dev/null && mysqladmin ping -uroot --silent) || \
+                  (command -v mariadb-admin >/dev/null && mariadb-admin ping -uroot --silent); do
+              sleep 2
+            done
+          '
 
       - if: ${{ matrix.tls != 'none' }}
         run: |
@@ -570,7 +581,13 @@ jobs:
 
       - run: docker compose -f tests/docker-compose.yml run -d -p 3306:3306 --name mysql_8 mysql_8
       - name: Wait for MySQL
-        run: timeout 60s bash -c 'until docker exec mysql_8 mysqladmin ping -uroot -ppassword --silent; do sleep 1; done' || (docker logs mysql_8 && exit 1)
+        run: |
+          docker exec mysql_8 bash -c '
+            until (command -v mysqladmin >/dev/null && mysqladmin ping -uroot -ppassword --silent) || \
+                  (command -v mariadb-admin >/dev/null && mariadb-admin ping -uroot -ppassword --silent); do
+              sleep 2
+            done
+          '
 
       # Run isolated MySQL tests to avoid stalling the main job.
       - run: |
@@ -609,7 +626,13 @@ jobs:
 
       - run: docker compose -f tests/docker-compose.yml run -d -p 3306:3306 --name mariadb_${{ matrix.mariadb }} mariadb_${{ matrix.mariadb }}
       - name: Wait for MariaDB
-        run: timeout 60s bash -c 'until docker exec mariadb_${{ matrix.mariadb }} mysqladmin ping -uroot -ppassword --silent; do sleep 1; done' || (docker logs mariadb_${{ matrix.mariadb }} && exit 1)
+        run: |
+          docker exec mariadb_${{ matrix.mariadb }} bash -c '
+            until (command -v mysqladmin >/dev/null && mysqladmin ping -uroot -ppassword --silent) || \
+                  (command -v mariadb-admin >/dev/null && mariadb-admin ping -uroot -ppassword --silent); do
+              sleep 2
+            done
+          '
 
       # Create data dir for offline mode
       - run: mkdir .sqlx
@@ -672,7 +695,12 @@ jobs:
         run: |
           docker stop mariadb_${{ matrix.mariadb }}
           docker compose -f tests/docker-compose.yml run -d -p 3306:3306 --name mariadb_${{ matrix.mariadb }}_client_ssl mariadb_${{ matrix.mariadb }}_client_ssl
-          timeout 60s bash -c 'until docker exec mariadb_${{ matrix.mariadb }}_client_ssl mysqladmin ping -uroot --silent; do sleep 1; done' || (docker logs mariadb_${{ matrix.mariadb }}_client_ssl && exit 1)
+          docker exec mariadb_${{ matrix.mariadb }}_client_ssl bash -c '
+            until (command -v mysqladmin >/dev/null && mysqladmin ping -uroot --silent) || \
+                  (command -v mariadb-admin >/dev/null && mariadb-admin ping -uroot --silent); do
+              sleep 2
+            done
+          '
 
       - if: ${{ matrix.tls != 'none' }}
         run: |