CI(msvc): switch to Qt 6 and CMake

BLumia · Jul 6, 2024 · a217ce9 · a217ce9
1 parent 9fe3aca
commit a217ce9
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 5 deletions.
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -3,22 +3,22 @@ name: Windows CI
 on: [push, pull_request]
 
 jobs:
-  msvc-build:
+  msvc-qmake-build:
 
     strategy:
       matrix:
-        vs: ['2019']
+        vs: ['2022']
         msvc_arch: ['x64']
 
-    runs-on: windows-2019
+    runs-on: windows-2022
 
     steps:
     - uses: actions/checkout@v4
     - name: Install Qt
       uses: jurplel/install-qt-action@v3
       with:
         arch: 'win64_msvc2019_64'
-        version: '5.15.2'
+        version: '6.7.1'
     - name: Build
       shell: cmd
       run: |
@@ -28,3 +28,41 @@ jobs:
         call %VCVARS% ${{ matrix.msvc_arch }}
         qmake pineapple-pictures.pro
         nmake
+        windeployqt --verbose=2 --no-quick-import --no-translations --no-opengl-sw --no-system-d3d-compiler --skip-plugin-types tls,networkinformation release\ppic.exe
+    - uses: actions/upload-artifact@v4
+      with:
+        name: windows-msvc2022-qt6.7.1-qmake-package
+        path: release/*
+
+  msvc-cmake-build:
+
+    strategy:
+      matrix:
+        vs: ['2022']
+        msvc_arch: ['x64']
+
+    runs-on: windows-2022
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Install Qt
+      uses: jurplel/install-qt-action@v3
+      with:
+        arch: 'win64_msvc2019_64'
+        version: '6.5.3'
+    - name: Build
+      shell: cmd
+      run: |
+        set PWD=%cd%
+        set VS=${{ matrix.vs }}
+        set VCVARS="C:\Program Files (x86)\Microsoft Visual Studio\%VS%\Enterprise\VC\Auxiliary\Build\vcvarsall.bat"
+        if not exist %VCVARS% set VCVARS="C:\Program Files\Microsoft Visual Studio\%VS%\Enterprise\VC\Auxiliary\Build\vcvarsall.bat"
+        call %VCVARS% ${{ matrix.msvc_arch }}
+        cmake -Bbuild . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="%PWD%\build\"
+        cmake --build build --config Release
+        cmake --build build --config Release --target=install
+        windeployqt --verbose=2 --no-quick-import --no-translations --no-opengl-sw --no-system-d3d-compiler --skip-plugin-types tls,networkinformation build\bin\ppic.exe
+    - uses: actions/upload-artifact@v4
+      with:
+        name: windows-msvc2022-qt6.5.3-cmake-package
+        path: build/bin/*
diff --git a/app/aboutdialog.cpp b/app/aboutdialog.cpp
@@ -66,7 +66,7 @@ AboutDialog::AboutDialog(QWidget *parent)
 
     QFile translaterHtml(":/plain/translators.html");
     bool canOpenFile = translaterHtml.open(QIODevice::ReadOnly);
-    const QByteArray & translatorList = canOpenFile ? translaterHtml.readAll() : "";
+    const QByteArray & translatorList = canOpenFile ? translaterHtml.readAll() : QByteArrayLiteral("");
 
     const QStringList specialThanksStr {
         QStringLiteral("<h1 align='center'>%1</h1><a href='%2'>%3</a><p>%4</p>").arg(