From 5854896a098aca0bb824f2f0cefcf33fe87f6201 Mon Sep 17 00:00:00 2001
From: silverqx <silver.zachara@gmail.com>
Date: Fri, 9 Aug 2024 17:17:17 +0200
Subject: [PATCH] workflows always install latest CMake and Ninja

---
 .github/workflows/clang-cl-qt6.yml | 4 ++++
 .github/workflows/linux-qt6.yml    | 8 +++-----
 .github/workflows/msvc2022-qt6.yml | 4 ++++
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/clang-cl-qt6.yml b/.github/workflows/clang-cl-qt6.yml
index 343b414d4..60aa5f626 100644
--- a/.github/workflows/clang-cl-qt6.yml
+++ b/.github/workflows/clang-cl-qt6.yml
@@ -626,6 +626,10 @@ jobs:
         version: ${{ env.TINY_LLVM_VERSION }}
         force-version: true
 
+    # Always install the latest CMake and Ninja
+    - name: CMake and Ninja install latest versions
+      uses: lukka/get-cmake@latest
+
     - name: Ccache initialize
       id: ccache-initialize-cache
       run: |
diff --git a/.github/workflows/linux-qt6.yml b/.github/workflows/linux-qt6.yml
index 1560b9d3b..76597aa0c 100644
--- a/.github/workflows/linux-qt6.yml
+++ b/.github/workflows/linux-qt6.yml
@@ -582,11 +582,9 @@ jobs:
         sudo apt install --yes ${{ join(matrix.compiler.apt, ' ') }}
         qt6-base-dev libqt6sql6-mysql libqt6sql6-sqlite libqt6sql6-psql ccache qmake6
 
-    # No need to use lukka/get-cmake, these images always have latest version
-    - name: Ninja install latest version
-      uses: seanmiddleditch/gha-setup-ninja@master
-      with:
-        destination: ${{ env.TinyRunnerWorkPath }}/ninja-build
+    # Always install the latest CMake and Ninja
+    - name: CMake and Ninja install latest versions
+      uses: lukka/get-cmake@latest
 
     - name: Ccache initialize
       id: ccache-initialize-cache
diff --git a/.github/workflows/msvc2022-qt6.yml b/.github/workflows/msvc2022-qt6.yml
index 8eeb8114c..6634d9bfb 100644
--- a/.github/workflows/msvc2022-qt6.yml
+++ b/.github/workflows/msvc2022-qt6.yml
@@ -637,6 +637,10 @@ jobs:
         -MySQLServerPath $env:TinyMySQLInstallationPath
         -BuildPath $env:RUNNER_WORKSPACE
 
+    # Always install the latest CMake and Ninja
+    - name: CMake and Ninja install latest versions
+      uses: lukka/get-cmake@latest
+
     - name: Ccache initialize
       id: ccache-initialize-cache
       run: |