diff --git a/.github/workflows/qctools.yml b/.github/workflows/qctools.yml index 7ac7ac7cd..fbbcdd066 100644 --- a/.github/workflows/qctools.yml +++ b/.github/workflows/qctools.yml @@ -13,8 +13,6 @@ jobs: - compiler: clang-9 packages: llvm@13 env: { 'CC': 'clang', 'CXX': 'clang++' } - - qt_version: "5.15.0" - qt_modules: "qtmultimedia" runs-on: macos-latest @@ -37,13 +35,7 @@ jobs: - name: Install dependencies run: | - brew install ${{ matrix.packages }} pkg-config ffmpeg - - - name: Install Qt5 - uses: jurplel/install-qt-action@v3 - with: - version: ${{ matrix.qt_version }} - modules: ${{ matrix.qt_modules }} + brew install ${{ matrix.packages }} pkg-config ffmpeg qt@5 - name: Install qwt-qt5 run: | @@ -73,8 +65,6 @@ jobs: - compiler: clang-9 packages: llvm@13 env: { 'CC': 'clang-9', 'CXX': 'clang++-9', 'HOMEBREW_NO_INSTALL_CLEANUP': '1', 'HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK': '1' } - - qt_version: "6.5.0" - qt_modules: "qtmultimedia" runs-on: macos-latest @@ -97,13 +87,7 @@ jobs: - name: Install dependencies run: | - brew install ${{ matrix.packages }} pkg-config ffmpeg - - - name: Install Qt6 - uses: jurplel/install-qt-action@v3 - with: - version: ${{ matrix.qt_version }} - modules: ${{ matrix.qt_modules }} + brew install ${{ matrix.packages }} pkg-config ffmpeg qt - name: Install qwt run: | @@ -132,6 +116,7 @@ jobs: - compiler: clang-9 packages: llvm@13 env: { 'CC': 'clang', 'CXX': 'clang++' } + - qt_version: "5.15.2" runs-on: macos-latest @@ -154,7 +139,13 @@ jobs: - name: Install dependencies run: | - brew install ${{ matrix.packages }} nasm qt@5 + brew install ${{ matrix.packages }} nasm + + - name: Install Qt5 + uses: jurplel/install-qt-action@v3 + with: + version: ${{ matrix.qt_version }} + modules: ${{ matrix.qt_modules }} - name: Set Qt5 environment path run: | @@ -202,7 +193,7 @@ jobs: - compiler: clang-9 packages: llvm@13 env: { 'CC': 'clang-9', 'CXX': 'clang++-9', 'HOMEBREW_NO_INSTALL_CLEANUP': '1', 'HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK': '1' } - - qt_version: "6.3.0" + - qt_version: "6.5.0" qt_modules: "qtmultimedia" runs-on: macos-latest