Skip to content

Commit

Permalink
Disable the 32-bit Windows builds since there aren't Qt6 packages
Browse files Browse the repository at this point in the history
  • Loading branch information
cameronwhite committed Sep 22, 2024
1 parent fb6c140 commit 6eff856
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 16 deletions.
20 changes: 4 additions & 16 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 6eff856

Please sign in to comment.