From 38417d23f77330910616e3bd5a374157f2eb5868 Mon Sep 17 00:00:00 2001
From: yxd92326 <stephen.riggs@diamond.ac.uk>
Date: Wed, 21 Aug 2024 14:06:10 +0100
Subject: [PATCH] Revert to MYSQL variables, and re-add setup action

---
 .github/workflows/ci.yml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6e4fbba..1af9543 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,10 +15,8 @@ jobs:
       mariadb:
         image: mariadb:10.6
         env:
-          MARIADB_USER: test
-          MARIADB_PASSWORD: test
-          MARIADB_DATABASE: ispybtest
-          MARIADB_ROOT_PASSWORD: mariadb_root_pwd
+          MYSQL_DATABASE: ispybtest
+          MYSQL_ROOT_PASSWORD: mariadb_root_pwd
         ports:
           - 3306:3306
         options: --health-cmd="healthcheck.sh --connect --innodb_initialized" --health-interval=10s --health-timeout=5s --health-retries=3
@@ -41,6 +39,12 @@ jobs:
           name: package-distributions
           path: dist/
 
+      - uses: shogo82148/actions-setup-mysql@v1
+        with:
+          distribution: 'mariadb'
+          mysql-version: '10.8'
+          auto-start: false
+
       - name: Set up test database
         run: |
           set -eu