From 7fd324d33708e5fa62c35f94aad1b85539387b9a Mon Sep 17 00:00:00 2001
From: Austin Bonander <austin@launchbadge.com>
Date: Fri, 11 Feb 2022 12:55:23 -0800
Subject: [PATCH] fix(ci): pin MySQL version in the correct place

---
 .github/workflows/sqlx.yml | 4 +---
 tests/docker-compose.yml   | 4 +++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/sqlx.yml b/.github/workflows/sqlx.yml
index 22576e94..44964b50 100644
--- a/.github/workflows/sqlx.yml
+++ b/.github/workflows/sqlx.yml
@@ -240,9 +240,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        # FIXME: 8.0.28 introduced a regression in our type tests: https://github.com/launchbadge/sqlx/issues/1664
-        # The MySQL devs agreed that it was a regression and that it will be fixed in 8.0.29
-        mysql: [8.0.27, 5_6]
+        mysql: [8, 5_6]
         runtime: [async-std, tokio, actix]
         tls: [native-tls, rustls]
     needs: check
diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml
index a5779d69..d67c1e1d 100644
--- a/tests/docker-compose.yml
+++ b/tests/docker-compose.yml
@@ -7,7 +7,9 @@ services:
     #
 
     mysql_8:
-        image: mysql:8.0
+        # FIXME: 8.0.28 introduced a regression in our type tests: https://github.com/launchbadge/sqlx/issues/1664
+        # The MySQL devs agreed that it was a regression and that it will be fixed in 8.0.29
+        image: mysql:8.0.27
         volumes:
             - "./mysql/setup.sql:/docker-entrypoint-initdb.d/setup.sql"
         ports: