From 564505511adc033134394a30089a5449cbfcbed9 Mon Sep 17 00:00:00 2001 From: Shaun Reed Date: Wed, 27 Dec 2023 06:38:42 -0500 Subject: [PATCH] Updpate Qt to 6.6.0 + Fixes windows CI from known Qt issue in 6.5.0 --- .github/workflows/all-builds.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/all-builds.yml b/.github/workflows/all-builds.yml index 11463e4..1bd542a 100644 --- a/.github/workflows/all-builds.yml +++ b/.github/workflows/all-builds.yml @@ -15,13 +15,13 @@ jobs: os: [ubuntu-latest, windows-latest, macos-latest] include: - os: ubuntu-latest - cmake: -DCMAKE_PREFIX_PATH=/home/runner/work/qtk/Qt/6.5.0/gcc_64/ $CONFIG + cmake: -DCMAKE_PREFIX_PATH=/home/runner/work/qtk/Qt/6.6.0/gcc_64/ $CONFIG flags: -j $(nproc) - os: windows-latest - cmake: -DCMAKE_PREFIX_PATH=D:/a/qtk/qtk/Qt/6.5.0/mingw81_64/ $CONFIG + cmake: -DCMAKE_PREFIX_PATH=D:/a/qtk/qtk/Qt/6.6.0/mingw81_64/ $CONFIG flags: '' - os: macos-latest - cmake: -DCMAKE_PREFIX_PATH=/home/runner/work/qtk/Qt/6.5.0/gcc_64/ $CONFIG + cmake: -DCMAKE_PREFIX_PATH=/home/runner/work/qtk/Qt/6.6.0/gcc_64/ $CONFIG flags: -j $(nproc) runs-on: ${{ matrix.os }} @@ -145,13 +145,13 @@ jobs: os: [ubuntu-latest, windows-latest, macos-latest] include: - os: ubuntu-latest - cmake: -DCMAKE_PREFIX_PATH=/home/runner/work/qtk/Qt/6.5.0/gcc_64/ $CONFIG + cmake: -DCMAKE_PREFIX_PATH=/home/runner/work/qtk/Qt/6.6.0/gcc_64/ $CONFIG flags: -j $(nproc) - os: windows-latest - cmake: -DCMAKE_PREFIX_PATH=D:/a/qtk/qtk/Qt/6.5.0/mingw81_64/ $CONFIG + cmake: -DCMAKE_PREFIX_PATH=D:/a/qtk/qtk/Qt/6.6.0/mingw81_64/ $CONFIG flags: '' - os: macos-latest - cmake: -DCMAKE_PREFIX_PATH=/home/runner/work/qtk/Qt/6.5.0/gcc_64/ $CONFIG + cmake: -DCMAKE_PREFIX_PATH=/home/runner/work/qtk/Qt/6.6.0/gcc_64/ $CONFIG flags: -j $(nproc) runs-on: ${{ matrix.os }} @@ -161,7 +161,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v2 with: - version: '6.5.0' + version: '6.6.0' # Windows @@ -250,13 +250,13 @@ jobs: os: [ubuntu-latest, windows-latest, macos-latest] include: - os: ubuntu-latest - cmake: -DCMAKE_PREFIX_PATH=/home/runner/work/qtk/Qt/6.5.0/gcc_64/ $CONFIG + cmake: -DCMAKE_PREFIX_PATH=/home/runner/work/qtk/Qt/6.6.0/gcc_64/ $CONFIG flags: -j $(nproc) - os: windows-latest - cmake: -DCMAKE_PREFIX_PATH=D:/a/qtk/qtk/Qt/6.5.0/mingw81_64/ $CONFIG + cmake: -DCMAKE_PREFIX_PATH=D:/a/qtk/qtk/Qt/6.6.0/mingw81_64/ $CONFIG flags: '' - os: macos-latest - cmake: -DCMAKE_PREFIX_PATH=/home/runner/work/qtk/Qt/6.5.0/gcc_64/ $CONFIG + cmake: -DCMAKE_PREFIX_PATH=/home/runner/work/qtk/Qt/6.6.0/gcc_64/ $CONFIG flags: -j $(nproc) runs-on: ${{ matrix.os }} @@ -266,7 +266,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v2 with: - version: '6.5.0' + version: '6.6.0' - name: Chocolatey Action if: matrix.os == 'windows-latest' @@ -295,9 +295,9 @@ jobs: os: [ubuntu-latest, macos-latest] include: - os: ubuntu-latest - cmake: -DCMAKE_PREFIX_PATH=/home/runner/work/qtk/Qt/6.5.0/gcc_64/ + cmake: -DCMAKE_PREFIX_PATH=/home/runner/work/qtk/Qt/6.6.0/gcc_64/ - os: macos-latest - cmake: -DCMAKE_PREFIX_PATH=/home/runner/work/qtk/Qt/6.5.0/gcc_64/ -DASSIMP_NEW_INTERFACE=ON + cmake: -DCMAKE_PREFIX_PATH=/home/runner/work/qtk/Qt/6.6.0/gcc_64/ runs-on: ${{ matrix.os }} steps: @@ -306,7 +306,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v2 with: - version: '6.5.0' + version: '6.6.0' - name: Install Assimp MacOS if: matrix.os == 'macos-latest' @@ -322,7 +322,7 @@ jobs: - name: Configure Qtk shell: bash - run: cmake -B build/ ${{ matrix.cmake }} -DQTK_CCACHE=OFF + run: cmake -B build/ ${{ matrix.cmake }} -DQTK_CCACHE=OFF -DQTK_ASSIMP_NEW_INTERFACE=ON - name: Build Qtk shell: bash