Merge branch 'main' into fix/browser-hang

dodona-edu · Jun 19, 2023 · 0615358 · 0615358
2 parents feef742 + faa7be1
commit 0615358
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -22,10 +22,12 @@ jobs:
         env:
           MYSQL_DATABASE: "dodona_test"
           MYSQL_ROOT_PASSWORD: "dodona"
+          MARIADB_MYSQL_LOCALHOST_USER: 1
+          MARIADB_MYSQL_LOCALHOST_GRANTS: USAGE
           MYSQL_HOST: "localhost"
         ports:
         - 3306:3306
-        options: --health-cmd "mysqladmin ping -h localhost" --health-interval 10s --health-timeout 5s --health-retries 5
+        options: --health-cmd="healthcheck.sh --su-mysql --connect --innodb_initialized" --health-interval=10s --health-timeout=5s --health-retries=5
     steps:
     - uses: actions/checkout@v3
     - name: Use ruby from .ruby-version
@@ -93,10 +95,12 @@ jobs:
         env:
           MYSQL_DATABASE: "dodona_test"
           MYSQL_ROOT_PASSWORD: "dodona"
+          MARIADB_MYSQL_LOCALHOST_USER: 1
+          MARIADB_MYSQL_LOCALHOST_GRANTS: USAGE
           MYSQL_HOST: "localhost"
         ports:
         - 3306:3306
-        options: --health-cmd "mysqladmin ping -h localhost" --health-interval 10s --health-timeout 5s --health-retries 5
+        options: --health-cmd="healthcheck.sh --su-mysql --connect --innodb_initialized" --health-interval=10s --health-timeout=5s --health-retries=5
     steps:
     - uses: actions/checkout@v3
     - name: Use ruby from .ruby-version