From e077f837f42bd75daa14618c2ec4c9126f1b63ec Mon Sep 17 00:00:00 2001
From: silverqx <silver.zachara@gmail.com>
Date: Fri, 9 Aug 2024 21:53:33 +0200
Subject: [PATCH] =?UTF-8?q?workflows=20bugfix=20missing=20Qt=20spec=20in?=
 =?UTF-8?q?=20bin/=20PATH=20=F0=9F=A4=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/analyzers.yml           | 7 +------
 .github/workflows/linux-qt6-drivers.yml   | 7 +------
 .github/workflows/vcpkg-linux-drivers.yml | 7 +------
 .github/workflows/vcpkg-linux.yml         | 7 +------
 4 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/analyzers.yml b/.github/workflows/analyzers.yml
index 9ca6d77d7..1348781bd 100644
--- a/.github/workflows/analyzers.yml
+++ b/.github/workflows/analyzers.yml
@@ -134,14 +134,9 @@ jobs:
 
     - name: ${{ matrix.qt.name }} prepare environment
       run: |
-        echo '/opt/Qt/${{ matrix.qt.version }}/bin' >> $GITHUB_PATH
+        echo '/opt/Qt/${{ matrix.qt.version }}/gcc_64/bin' >> $GITHUB_PATH
         echo "LD_LIBRARY_PATH=/opt/Qt/${{ matrix.qt.version }}/gcc_64/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" >> $GITHUB_ENV
 
-        # The CMAKE_PREFIX_PATH must be defined on the GitHub Actions, this is some kind of a bug because the CMake
-        # can't find the Qt, but if I export the PATH directly in the step it works but doesn't work using
-        # the GITHUB_PATH like define two line above. 🫤
-        echo "CMAKE_PREFIX_PATH=/opt/Qt/${{ matrix.qt.version }}/gcc_64${CMAKE_PREFIX_PATH:+:}$CMAKE_PREFIX_PATH" >> $GITHUB_ENV
-
     - name: Compiler print version (${{ env.TINY_COMPILER_COMMAND }})
       run: |
         ${{ env.TINY_COMPILER_COMMAND }} --version
diff --git a/.github/workflows/linux-qt6-drivers.yml b/.github/workflows/linux-qt6-drivers.yml
index 8e52089c6..6bfae2e00 100644
--- a/.github/workflows/linux-qt6-drivers.yml
+++ b/.github/workflows/linux-qt6-drivers.yml
@@ -211,14 +211,9 @@ jobs:
 
     - name: Qt v${{ env.TINY_QT_VERSION }} prepare environment
       run: |
-        echo "/opt/Qt/$TINY_QT_VERSION/bin" >> $GITHUB_PATH
+        echo "/opt/Qt/$TINY_QT_VERSION/$TinyQtSpecPlain/bin" >> $GITHUB_PATH
         echo "LD_LIBRARY_PATH=/opt/Qt/$TINY_QT_VERSION/$TinyQtSpecPlain/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" >> $GITHUB_ENV
 
-        # The CMAKE_PREFIX_PATH must be defined on the GitHub Actions, this is some kind of a bug
-        # because the CMake can't find the Qt, but if I export the PATH directly in the step
-        # it works but doesn't work using the GITHUB_PATH like define two line above. 🫤
-        echo "CMAKE_PREFIX_PATH=/opt/Qt/$TINY_QT_VERSION/$TinyQtSpecPlain${CMAKE_PREFIX_PATH:+:}$CMAKE_PREFIX_PATH" >> $GITHUB_ENV
-
     - name: Compiler print version (${{ matrix.compiler.command }})
       run: |
         ${{ matrix.compiler.command }} --version
diff --git a/.github/workflows/vcpkg-linux-drivers.yml b/.github/workflows/vcpkg-linux-drivers.yml
index 33558c82f..a1f4b0fee 100644
--- a/.github/workflows/vcpkg-linux-drivers.yml
+++ b/.github/workflows/vcpkg-linux-drivers.yml
@@ -315,14 +315,9 @@ jobs:
 
     - name: ${{ matrix.qt.name }} prepare environment
       run: |
-        echo '/opt/Qt/${{ matrix.qt.version }}/bin' >> $GITHUB_PATH
+        echo '/opt/Qt/${{ matrix.qt.version }}/gcc_64/bin' >> $GITHUB_PATH
         echo "LD_LIBRARY_PATH=/opt/Qt/${{ matrix.qt.version }}/gcc_64/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" >> $GITHUB_ENV
 
-        # The CMAKE_PREFIX_PATH must be defined on the GitHub Actions, this is some kind of a bug
-        # because the CMake can't find the Qt, but if I export the PATH directly in the step
-        # it works but doesn't work using the GITHUB_PATH like define two line above. 🫤
-        echo "CMAKE_PREFIX_PATH=/opt/Qt/${{ matrix.qt.version }}/gcc_64${CMAKE_PREFIX_PATH:+:}$CMAKE_PREFIX_PATH" >> $GITHUB_ENV
-
     # Prepare ccache
     #
     # The TinyORM build in the Manual method and the FetchContent method are using the ccache,
diff --git a/.github/workflows/vcpkg-linux.yml b/.github/workflows/vcpkg-linux.yml
index 2a96210cd..b93f8a234 100644
--- a/.github/workflows/vcpkg-linux.yml
+++ b/.github/workflows/vcpkg-linux.yml
@@ -278,14 +278,9 @@ jobs:
 
     - name: ${{ matrix.qt.name }} prepare environment
       run: |
-        echo '/opt/Qt/${{ matrix.qt.version }}/bin' >> $GITHUB_PATH
+        echo '/opt/Qt/${{ matrix.qt.version }}/gcc_64/bin' >> $GITHUB_PATH
         echo "LD_LIBRARY_PATH=/opt/Qt/${{ matrix.qt.version }}/gcc_64/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" >> $GITHUB_ENV
 
-        # The CMAKE_PREFIX_PATH must be defined on the GitHub Actions, this is some kind of a bug
-        # because the CMake can't find the Qt, but if I export the PATH directly in the step
-        # it works but doesn't work using the GITHUB_PATH like define two line above. 🫤
-        echo "CMAKE_PREFIX_PATH=/opt/Qt/${{ matrix.qt.version }}/gcc_64${CMAKE_PREFIX_PATH:+:}$CMAKE_PREFIX_PATH" >> $GITHUB_ENV
-
     # Prepare ccache
     #
     # The TinyORM build in the Manual method and the FetchContent method are using the ccache,