From 19be17e0cbe1c043954a3c35990afab7e1e70c4c Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Mon, 19 Jun 2023 14:35:08 +0200 Subject: [PATCH 1/5] Fixate previous mariadb version --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index fd309064ac..a20641c013 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest services: mysql: - image: mariadb + image: mariadb:'10.11.3' env: MYSQL_DATABASE: "dodona_test" MYSQL_ROOT_PASSWORD: "dodona" From 41b74b62f9a0f436d1ab2e69fb949a0376403d53 Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Mon, 19 Jun 2023 14:37:05 +0200 Subject: [PATCH 2/5] Update version notation --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a20641c013..89d7b363d1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest services: mysql: - image: mariadb:'10.11.3' + image: 'mariadb:10.11.3' env: MYSQL_DATABASE: "dodona_test" MYSQL_ROOT_PASSWORD: "dodona" From 1a048b881847c92eebbac72974f688676652bc4f Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Mon, 19 Jun 2023 14:40:06 +0200 Subject: [PATCH 3/5] Also fix system tests --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 89d7b363d1..0f20bf9a70 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -89,7 +89,7 @@ jobs: runs-on: ubuntu-latest services: mysql: - image: mariadb + image: 'mariadb:10.11.3' env: MYSQL_DATABASE: "dodona_test" MYSQL_ROOT_PASSWORD: "dodona" From 70d4cd4bdf53e1ee2fb7d11bfff0b6749e47014a Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Mon, 19 Jun 2023 14:53:39 +0200 Subject: [PATCH 4/5] Try using latest mariadb --- .github/workflows/test.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0f20bf9a70..f65e807357 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,14 +18,16 @@ jobs: runs-on: ubuntu-latest services: mysql: - image: 'mariadb:10.11.3' + image: mariadb env: MYSQL_DATABASE: "dodona_test" - MYSQL_ROOT_PASSWORD: "dodona" + MARIADB_ALLOW_EMPTY_ROOT_PASSWORD: true + 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 @@ -89,14 +91,16 @@ jobs: runs-on: ubuntu-latest services: mysql: - image: 'mariadb:10.11.3' + image: mariadb env: MYSQL_DATABASE: "dodona_test" - MYSQL_ROOT_PASSWORD: "dodona" + MARIADB_ALLOW_EMPTY_ROOT_PASSWORD: true + 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 From 60fdc61ab1067fe458371805be7a77dbdf76edb9 Mon Sep 17 00:00:00 2001 From: jorg-vr Date: Mon, 19 Jun 2023 14:57:13 +0200 Subject: [PATCH 5/5] Reintroduce root password --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f65e807357..e51ab9c03f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,7 +21,7 @@ jobs: image: mariadb env: MYSQL_DATABASE: "dodona_test" - MARIADB_ALLOW_EMPTY_ROOT_PASSWORD: true + MYSQL_ROOT_PASSWORD: "dodona" MARIADB_MYSQL_LOCALHOST_USER: 1 MARIADB_MYSQL_LOCALHOST_GRANTS: USAGE MYSQL_HOST: "localhost" @@ -94,7 +94,7 @@ jobs: image: mariadb env: MYSQL_DATABASE: "dodona_test" - MARIADB_ALLOW_EMPTY_ROOT_PASSWORD: true + MYSQL_ROOT_PASSWORD: "dodona" MARIADB_MYSQL_LOCALHOST_USER: 1 MARIADB_MYSQL_LOCALHOST_GRANTS: USAGE MYSQL_HOST: "localhost"