From 059a7fa3d4dda53d5f773b2dd29df2f190ed95be Mon Sep 17 00:00:00 2001
From: silverqx <silver.zachara@gmail.com>
Date: Mon, 10 Jun 2024 09:23:29 +0200
Subject: [PATCH] workflows cache QMYSQL driver by MySQL version

---
 .github/workflows/clang-cl-qt6.yml | 11 ++++++++++-
 .github/workflows/msvc2022-qt6.yml | 11 ++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/clang-cl-qt6.yml b/.github/workflows/clang-cl-qt6.yml
index a32c03521..912b6fc57 100644
--- a/.github/workflows/clang-cl-qt6.yml
+++ b/.github/workflows/clang-cl-qt6.yml
@@ -563,6 +563,14 @@ jobs:
         $qtVersion = $env:TINY_QT_VERSION.Replace('.', '')
         "QtVersion=$qtVersion" >> $env:GITHUB_OUTPUT
 
+        [System.Version] $mysqlVersionRaw = ('select version();' |
+        mysql --user=$env:DB_MYSQL_USERNAME --password=$env:DB_MYSQL_PASSWORD)[1]
+        $mysqlVersion = '{0}{1}' -f $mysqlVersionRaw.Major, $mysqlVersionRaw.Minor
+        "MySQLVersion=$mysqlVersion" >> $env:GITHUB_OUTPUT
+      env:
+        DB_MYSQL_PASSWORD: ${{ secrets.DB_MYSQL_PASSWORD }}
+        DB_MYSQL_USERNAME: ${{ secrets.DB_MYSQL_USERNAME }}
+
     - name: QMYSQL driver DLLs restore cache
       uses: actions/cache@v3
       id: compiles-cache-qmysql-dlls
@@ -570,10 +578,11 @@ jobs:
         path: |
           ${{ env.QT_PLUGIN_PATH }}/sqldrivers/qsqlmysql*.dll
           ${{ env.QT_PLUGIN_PATH }}/sqldrivers/qsqlmysql*.pdb
-        key: ${{ runner.os }}-drivers-${{ env.cache_name }}-${{ env.qt_version }}
+        key: ${{ runner.os }}-drivers-${{ env.cache_name }}-${{ env.qt_version }}-${{ env.mysql_version }}
       env:
         cache_name: qmysql-dlls-qt
         qt_version: ${{ steps.compiles-initialize-qmysql-dlls.outputs.QtVersion }}
+        mysql_version: ${{ steps.compiles-initialize-qmysql-dlls.outputs.MySQLVersion }}
 
     - name: QMYSQL driver DLLs build and install 🚀 (Qt ${{ env.TINY_QT_VERSION }})
       if: steps.compiles-cache-qmysql-dlls.outputs.cache-hit != 'true'
diff --git a/.github/workflows/msvc2022-qt6.yml b/.github/workflows/msvc2022-qt6.yml
index 1a9fe4215..b84bd30e4 100644
--- a/.github/workflows/msvc2022-qt6.yml
+++ b/.github/workflows/msvc2022-qt6.yml
@@ -576,6 +576,14 @@ jobs:
         $qtVersion = $env:TINY_QT_VERSION.Replace('.', '')
         "QtVersion=$qtVersion" >> $env:GITHUB_OUTPUT
 
+        [System.Version] $mysqlVersionRaw = ('select version();' |
+        mysql --user=$env:DB_MYSQL_PASSWORD --password=$env:DB_MYSQL_PASSWORD)[1]
+        $mysqlVersion = '{0}{1}' -f $mysqlVersionRaw.Major, $mysqlVersionRaw.Minor
+        "MySQLVersion=$mysqlVersion" >> $env:GITHUB_OUTPUT
+      env:
+        DB_MYSQL_PASSWORD: ${{ secrets.DB_MYSQL_PASSWORD }}
+        DB_MYSQL_USERNAME: ${{ secrets.DB_MYSQL_USERNAME }}
+
     - name: QMYSQL driver DLLs restore cache
       uses: actions/cache@v3
       id: compiles-cache-qmysql-dlls
@@ -583,10 +591,11 @@ jobs:
         path: |
           ${{ env.QT_PLUGIN_PATH }}/sqldrivers/qsqlmysql*.dll
           ${{ env.QT_PLUGIN_PATH }}/sqldrivers/qsqlmysql*.pdb
-        key: ${{ runner.os }}-drivers-${{ env.cache_name }}-${{ env.qt_version }}
+        key: ${{ runner.os }}-drivers-${{ env.cache_name }}-${{ env.qt_version }}-${{ env.mysql_version }}
       env:
         cache_name: qmysql-dlls-qt
         qt_version: ${{ steps.compiles-initialize-qmysql-dlls.outputs.QtVersion }}
+        mysql_version: ${{ steps.compiles-initialize-qmysql-dlls.outputs.MySQLVersion }}
 
     - name: QMYSQL driver DLLs build and install 🚀 (Qt ${{ env.TINY_QT_VERSION }})
       if: steps.compiles-cache-qmysql-dlls.outputs.cache-hit != 'true'