workflows bugfix missing Qt spec in bin/ PATH 🤔

silverqx · Aug 10, 2024 · e077f83 · e077f83
1 parent bd7b6fd
commit e077f83
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 24 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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,