diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f308bb8f..adb0eacc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -81,18 +81,6 @@ jobs: runs-on: windows-2022 - # Run both 32-bit and 64-bit builds. - strategy: - matrix: - arch: [x64, x86] - include: - - arch: x64 - cmake_arch: x64 - qt_arch: win64_msvc2019_64 - - arch: x86 - cmake_arch: Win32 - qt_arch: win32_msvc2019 - steps: - uses: actions/checkout@v4 @@ -101,17 +89,17 @@ jobs: run: echo "::set-output name=VERSION_ID::$(git describe --tags --long --always)" - name: Install Dependencies - run: vcpkg install --triplet ${{ matrix.arch }}-windows boost-algorithm boost-date-time boost-endian boost-functional boost-iostreams boost-rational boost-signals2 boost-stacktrace doctest minizip nlohmann-json pugixml + run: vcpkg install --triplet x64-windows boost-algorithm boost-date-time boost-endian boost-functional boost-iostreams boost-rational boost-signals2 boost-stacktrace doctest minizip nlohmann-json pugixml # Building Qt via vcpkg would take a while ... - name: Install Qt uses: jurplel/install-qt-action@v4 with: - arch: ${{ matrix.qt_arch }} + arch: win64_msvc2019_64 version: 6.7.2 - name: Generate Project - run: cmake -A ${{ matrix.cmake_arch }} -B ./build -DPTE_ENABLE_PCH=1 -DCMAKE_TOOLCHAIN_FILE="${env:VCPKG_INSTALLATION_ROOT}/scripts/buildsystems/vcpkg.cmake" + run: cmake -A x64 -B ./build -DPTE_ENABLE_PCH=1 -DCMAKE_TOOLCHAIN_FILE="${env:VCPKG_INSTALLATION_ROOT}/scripts/buildsystems/vcpkg.cmake" - name: Build run: cmake --build ./build --config Release - name: Test @@ -121,7 +109,7 @@ jobs: run: | choco install innosetup -y -v iscc installer/windows/installer.iss - mv installer/windows/powertabeditor.exe installer/windows/powertabeditor-windows-${{ matrix.arch }}-${{ steps.version.outputs.VERSION_ID }}.exe + mv installer/windows/powertabeditor.exe installer/windows/powertabeditor-windows-x64-${{ steps.version.outputs.VERSION_ID }}.exe - name: Upload Installer uses: actions/upload-artifact@v4 diff --git a/CHANGELOG.md b/CHANGELOG.md index 6fca86b6..1c23b8b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ Thanks to the following contributors who worked on this release: ### Changed - Chord diagrams now display the fret number of the top fret instead of the next fret after it (#408) +- Removed the 32-bit Windows installers - Updated the minimum required version of `RtMidi` to 4.0 - Updated the minimum required version of `boost` to 1.74 - Updated the minimum required version of `Qt` to 6.2 diff --git a/cmake/third_party/Qt.cmake b/cmake/third_party/Qt.cmake index ab92a410..d6346d6e 100644 --- a/cmake/third_party/Qt.cmake +++ b/cmake/third_party/Qt.cmake @@ -8,8 +8,8 @@ find_package( Qt6 REQUIRED COMPONENTS set( QT_PLUGINS ) if ( PLATFORM_WIN ) set( QT_PLUGINS - Qt::QWindowsIntegrationPlugin - Qt::QWindowsVistaStylePlugin + Qt6::QWindowsIntegrationPlugin + Qt6::QModernWindowsStylePlugin ) endif ()