From 1096bda65545b3d8eeb62d298a9e5e0dae1110d4 Mon Sep 17 00:00:00 2001 From: silverqx Date: Fri, 9 Aug 2024 16:59:34 +0200 Subject: [PATCH] workflows bugfix print Qt version --- .github/workflows/linux-qt6.yml | 5 +++-- .github/workflows/msys2-ucrt64-drivers.yml | 2 +- .github/workflows/msys2-ucrt64.yml | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/linux-qt6.yml b/.github/workflows/linux-qt6.yml index f8dce35e6..1560b9d3b 100644 --- a/.github/workflows/linux-qt6.yml +++ b/.github/workflows/linux-qt6.yml @@ -576,10 +576,11 @@ jobs: run: | sudo apt update + # qmake6 is used to query Qt version only - name: apt install ${{ join(matrix.compiler.apt, ', ') }}, Qt 6 base, and ccache run: >- sudo apt install --yes ${{ join(matrix.compiler.apt, ' ') }} - qt6-base-dev libqt6sql6-mysql libqt6sql6-sqlite libqt6sql6-psql ccache + 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 @@ -650,7 +651,7 @@ jobs: - name: Qt print version run: | - qmake -query QT_VERSION + qmake6 -query QT_VERSION - name: Ccache clear statistics run: | diff --git a/.github/workflows/msys2-ucrt64-drivers.yml b/.github/workflows/msys2-ucrt64-drivers.yml index 1cb086a1a..2497480fb 100644 --- a/.github/workflows/msys2-ucrt64-drivers.yml +++ b/.github/workflows/msys2-ucrt64-drivers.yml @@ -245,7 +245,7 @@ jobs: - name: Qt print version shell: msys2 {0} run: | - qmake.exe -query QT_VERSION + qmake6.exe -query QT_VERSION - name: Ccache clear statistics shell: msys2 {0} diff --git a/.github/workflows/msys2-ucrt64.yml b/.github/workflows/msys2-ucrt64.yml index 9986689f6..ae1d3ad27 100644 --- a/.github/workflows/msys2-ucrt64.yml +++ b/.github/workflows/msys2-ucrt64.yml @@ -397,7 +397,7 @@ jobs: - name: Qt print version shell: msys2 {0} run: | - qmake.exe -query QT_VERSION + qmake6.exe -query QT_VERSION - name: Ccache clear statistics shell: msys2 {0}