From 840b4b92a114eb0f3ab325d88e431127b36bc666 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20van=20Eeden?= <git@myname.nl>
Date: Sun, 3 Aug 2025 11:03:39 +0200
Subject: [PATCH] CI: Update MySQL, MySQL APT and TiDB versions

---
 .github/workflows/ci.yml | 26 +++++++++++++-------------
 Dockerfile               |  4 ++--
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f98689d3..d7112095 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,14 +20,14 @@ jobs:
             client: "8.4"
             server: "8.0"
           - os: ubuntu-22.04
-            client: "9.3"
+            client: "9.4"
             server: "8.4"
           - os: ubuntu-22.04
-            client: "9.3"
-            server: "9.3"
+            client: "9.4"
+            server: "9.4"
           - os: ubuntu-24.04
-            client: "9.3"
-            server: "9.3"
+            client: "9.4"
+            server: "9.4"
     runs-on: ${{ matrix.os }}
     services:
       mysql:
@@ -64,15 +64,15 @@ jobs:
           sudo debconf-set-selections <<EOF
           mysql-apt-config      mysql-apt-config/select-server  select  mysql-8.4-lts
           EOF
-      - if: matrix.client == '9.3'
+      - if: matrix.client == '9.4'
         run: |
           sudo debconf-set-selections <<EOF
           mysql-apt-config      mysql-apt-config/select-server  select  mysql-innovation
           EOF
       - name: "Setup mysql libs"
         run: |
-          wget https://dev.mysql.com/get/mysql-apt-config_0.8.33-1_all.deb
-          DEBIAN_FRONTEND="noninteractive" sudo dpkg -i mysql-apt-config_0.8.33-1_all.deb
+          wget https://dev.mysql.com/get/mysql-apt-config_0.8.34-1_all.deb
+          DEBIAN_FRONTEND="noninteractive" sudo dpkg -i mysql-apt-config_0.8.34-1_all.deb
           sudo apt update
           sudo apt install -y libmysqlclient-dev
       - name: "Run build"
@@ -110,8 +110,8 @@ jobs:
           sudo debconf-set-selections <<EOF
           mysql-apt-config      mysql-apt-config/select-server  select  mysql-8.4-lts
           EOF
-          wget https://dev.mysql.com/get/mysql-apt-config_0.8.33-1_all.deb
-          DEBIAN_FRONTEND="noninteractive" sudo dpkg -i mysql-apt-config_0.8.33-1_all.deb
+          wget https://dev.mysql.com/get/mysql-apt-config_0.8.34-1_all.deb
+          DEBIAN_FRONTEND="noninteractive" sudo dpkg -i mysql-apt-config_0.8.34-1_all.deb
           sudo apt update
           sudo apt install -y libmysqlclient-dev
       - name: "Run build"
@@ -125,7 +125,7 @@ jobs:
     runs-on: 'ubuntu-latest'
     services:
       mariadb:
-        image: 'pingcap/tidb:v8.5.1'
+        image: 'pingcap/tidb:v8.5.2'
         ports:
           - 4000:4000
     steps:
@@ -146,8 +146,8 @@ jobs:
           sudo debconf-set-selections <<EOF
           mysql-apt-config      mysql-apt-config/select-server  select  mysql-8.4-lts
           EOF
-          wget https://dev.mysql.com/get/mysql-apt-config_0.8.33-1_all.deb
-          DEBIAN_FRONTEND="noninteractive" sudo dpkg -i mysql-apt-config_0.8.33-1_all.deb
+          wget https://dev.mysql.com/get/mysql-apt-config_0.8.34-1_all.deb
+          DEBIAN_FRONTEND="noninteractive" sudo dpkg -i mysql-apt-config_0.8.34-1_all.deb
           sudo apt update
           sudo apt install -y libmysqlclient-dev
       - name: "Run build"
diff --git a/Dockerfile b/Dockerfile
index 2cdf8d19..df233cd6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,8 +3,8 @@ FROM perl:5.40
 # Add MySQL APT Repository
 RUN apt-get update
 RUN apt-get install -y lsb-release debconf-utils cpanminus
-ADD https://dev.mysql.com/get/mysql-apt-config_0.8.32-1_all.deb .
-RUN DEBIAN_FRONTEND=noninteractive dpkg -i mysql-apt-config_0.8.32-1_all.deb
+ADD https://dev.mysql.com/get/mysql-apt-config_0.8.34-1_all.deb .
+RUN DEBIAN_FRONTEND=noninteractive dpkg -i mysql-apt-config_0.8.34-1_all.deb
 
 RUN apt-get update
 RUN apt-get install -y libmysqlclient-dev