Skip to content

Commit

Permalink
Revert "Revert back to Qt5 on windows"
Browse files Browse the repository at this point in the history
This reverts commit c18f596.
  • Loading branch information
psieg committed Feb 10, 2024
1 parent 862d2d9 commit e3fdd8a
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,8 @@ jobs:
with:
cache: true
cache-key-prefix: install-qt-action-default
version: 5.*
version: 6.*
modules: qtserialport
- name: Cached Bass
id: cache-bass
uses: actions/cache@v2
Expand Down Expand Up @@ -154,7 +155,7 @@ jobs:
- name: Build
shell: cmd
run: |
set QTDIR=%Qt5_Dir%
set QTDIR=%Qt6_Dir%
call scripts\win32\generate_sln.bat
MSBuild.exe Lightpack.sln /p:Configuration=Release
- name: Prepare Installer
Expand All @@ -164,7 +165,7 @@ jobs:
- name: Build Installer
shell: cmd
run: |
"C:/Program Files (x86)/Inno Setup 6/ISCC.exe" script.iss
"C:/Program Files (x86)/Inno Setup 6/ISCC.exe" script_qt6.iss
working-directory: ./Software/dist_windows
- name: Check Package
shell: bash
Expand Down

0 comments on commit e3fdd8a

Please sign in to comment.