WIP

Icinga · Jul 16, 2024 · 6a2beeb · 6a2beeb
1 parent d0abbb0
commit 6a2beeb
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/.github/workflows/sql.yml b/.github/workflows/sql.yml
@@ -26,8 +26,8 @@ jobs:
           - {name: MariaDB 10.6,   image: "mariadb:10.6"}
           - {name: MariaDB 10.7,   image: "mariadb:10.7"}
           - {name: MariaDB 10.11,  image: "mariadb:10.11"}
-          - {name: MariaDB 11.0,   image: "mariadb:11.0", compat: 'false'}
-          - {name: MariaDB latest, image: "mariadb:latest", compat: 'false'}
+          - {name: MariaDB 11.0,   image: "mariadb:11.0", healthcmd: "healthcheck.sh --connect --innodb_initialized"}
+          - {name: MariaDB latest, image: "mariadb:latest", healthcmd: "healthcheck.sh --connect --innodb_initialized"}
 
     env:
       ICINGAGOLIBRARY_TESTS_DB_TYPE: mysql
@@ -47,7 +47,7 @@ jobs:
           MARIADB_DATABASE: icinga_unittest # mariadb >= 11
         # Wait for the containers to become ready
         options: >-
-          --health-cmd ${{ matrix.database.compat != 'false' && '"mysqladmin ping"' || '"healthcheck.sh --connect --innodb_initialized"' }}
+          --health-cmd "${{ matrix.database.healthcmd || 'mysqladmin ping' }}"
           --health-interval 10s
           --health-timeout 5s
           --health-retries 10