Remove obsolete platforms from GitHub Actions (open-eid#1180)

IB-7703 Signed-off-by: Raul Metsma <[email protected]>
metsma · Apr 18, 2023 · 9b8139a · 9b8139a
1 parent 530265e
commit 9b8139a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 50 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -142,24 +142,11 @@ jobs:
     strategy:
       matrix:
         vcver: [142, 143]
-        arch: [x64]
-        qtver: [6.4.2]
-        qt: [win64_msvc2019_64]
-        qtmodules: [qt5compat]
         include:
         - vcver: 142
           image: windows-2019
-          toolset: 14.29
         - vcver: 143
           image: windows-2022
-          toolset: 14.34
-        - vcver: 141
-          arch: x86
-          qtver: 5.12.12
-          qt: win32_msvc2017
-          qtmodules:
-          image: windows-2019
-          toolset: 14.16
     env:
       VER_SUFFIX: .VS${{ matrix.vcver }}
     steps:
@@ -184,26 +171,25 @@ jobs:
       with:
         vcpkgArguments: openssl
         vcpkgGitCommitId: a69b65229b3956b7f45abd81671b7330114bcaad
-        vcpkgTriplet: ${{ matrix.arch }}-windows
+        vcpkgTriplet: x64-windows
     - name: Install Qt
       uses: jurplel/install-qt-action@v3
       with:
-        version: ${{ matrix.qtver }}
-        arch: ${{ matrix.qt }}
-        modules: ${{ matrix.qtmodules }}
+        version: 6.4.3
+        arch: win64_msvc2019_64
+        modules: qt5compat
     - name: Setup dev env
       uses: ilammy/msvc-dev-cmd@v1
       with:
-        arch: ${{ matrix.arch }}
+        arch: x64
         sdk: 10.0.17763.0
-        toolset: ${{ matrix.toolset }}
     - name: Build
       run: |
         md build/client
-        copy ${{ env.VCPKG_ROOT }}\installed\${{ matrix.arch }}-windows\bin\*.dll build\client\
+        copy ${{ env.VCPKG_ROOT }}\installed\x64-windows\bin\*.dll build\client\
         cmake "-GNinja" -DCMAKE_BUILD_TYPE=RelWithDebInfo `
           -DCMAKE_TOOLCHAIN_FILE=${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake `
-          "-DLIBDIGIDOCPP_LIBRARY=libs/libdigidocpp/${{ matrix.arch }}/digidocpp.lib" `
+          "-DLIBDIGIDOCPP_LIBRARY=libs/libdigidocpp/x64/digidocpp.lib" `
           "-DLIBDIGIDOCPP_INCLUDE_DIR=libs/libdigidocpp/include" -B build -S .
         cmake --build build --target msi
         cmake --build build --target appx

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.16)
-project(qdigidoc4 VERSION 4.3.0)
+project(qdigidoc4 VERSION 4.4.0)
 
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
@@ -232,7 +232,7 @@ elseif(WIN32)
 	list(APPEND CANDLE_CMD "$ENV{WIX}bin\\candle.exe" -nologo -arch ${PLATFORM} -dMSI_VERSION=${VERSION} -dPlatform=${PLATFORM}
 		-dlibs_path="${LIBS_PATH}" -dclient_path=$<TARGET_FILE:${PROJECT_NAME}> -dico_path=${CMAKE_CURRENT_SOURCE_DIR}/images/digidoc.ico
 		-dqtconf=${CMAKE_SOURCE_DIR}/qt.conf -dschemasLocation=${LIBS_PATH}/schema SchemasFragment.wxs
-		-dqt_ver_major=${QT_VERSION_MAJOR} -dqt_suffix=$<$<CONFIG:Debug>:d> ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.wxs
+		-dqt_suffix=$<$<CONFIG:Debug>:d> ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.wxs
 		${CMAKE_SOURCE_DIR}/cmake/modules/WelcomeDlg2.wxs ${CMAKE_SOURCE_DIR}/cmake/modules/WixUI_Minimal2.wxs)
 	list(APPEND LIGHT_CMD "$ENV{WIX}bin\\light.exe" -nologo -ext WixUIExtension
 		${PROJECT_NAME}.wixobj SchemasFragment.wixobj WelcomeDlg2.wixobj WixUI_Minimal2.wixobj

diff --git a/qdigidoc4.wxs b/qdigidoc4.wxs
@@ -29,8 +29,6 @@ msiexec /a libdigidocpp-3.13.8.1378.msi /qn TARGETDIR=C:\target
 <?define VCVER = "143" ?>
 <?elseif $(env.VisualStudioVersion) = "16.0" ?>
 <?define VCVER = "142" ?>
-<?elseif $(env.VisualStudioVersion) = "15.0" ?>
-<?define VCVER = "141" ?>
 <?endif?>
 
 <?if $(var.qt_suffix) = "d" ?>
@@ -149,23 +147,16 @@ msiexec /a libdigidocpp-3.13.8.1378.msi /qn TARGETDIR=C:\target
 <?endif ?>
             <File Source="$(var.libs_path)\libcrypto-1_1$(var.OpenSSLSuffix).dll"/>
             <File Source="$(var.libs_path)\libssl-1_1$(var.OpenSSLSuffix).dll"/>
-            <File Source="$(var.qt_path)\Qt$(var.qt_ver_major)Core$(var.qt_suffix).dll"/>
-            <File Source="$(var.qt_path)\Qt$(var.qt_ver_major)Gui$(var.qt_suffix).dll"/>
-            <File Source="$(var.qt_path)\Qt$(var.qt_ver_major)Network$(var.qt_suffix).dll"/>
-            <File Source="$(var.qt_path)\Qt$(var.qt_ver_major)PrintSupport$(var.qt_suffix).dll"/>
-            <File Source="$(var.qt_path)\Qt$(var.qt_ver_major)Svg$(var.qt_suffix).dll"/>
-            <File Source="$(var.qt_path)\Qt$(var.qt_ver_major)Widgets$(var.qt_suffix).dll"/>
+            <File Source="$(var.qt_path)\Qt6Core$(var.qt_suffix).dll"/>
+            <File Source="$(var.qt_path)\Qt6Gui$(var.qt_suffix).dll"/>
+            <File Source="$(var.qt_path)\Qt6Network$(var.qt_suffix).dll"/>
+            <File Source="$(var.qt_path)\Qt6PrintSupport$(var.qt_suffix).dll"/>
+            <File Source="$(var.qt_path)\Qt6Svg$(var.qt_suffix).dll"/>
+            <File Source="$(var.qt_path)\Qt6Widgets$(var.qt_suffix).dll"/>
             <File Source="$(var.qt_path)\D3DCompiler_47.dll"/>
             <File Source="$(var.qt_path)\opengl32sw.dll"/>
-<?if $(var.qt_ver_major) = "5" ?>
-            <File Source="$(var.qt_path)\Qt5WinExtras$(var.qt_suffix).dll"/>
-            <File Source="$(var.qt_path)\libEGL$(var.qt_suffix).dll"/>
-            <File Source="$(var.qt_path)\libGLESv2$(var.qt_suffix).dll"/>
-            <File Source="$(var.qtconf)" />
-<?else ?>
             <File Source="$(var.qt_path)\Qt6Core5Compat$(var.qt_suffix).dll"/>
             <File Source="$(var.qt_path)\Qt6SvgWidgets$(var.qt_suffix).dll"/>
-<?endif?>
 <?endif?>
           </Component>
           <Directory Id="SchemaFolder" Name="schema"/>
@@ -175,19 +166,11 @@ msiexec /a libdigidocpp-3.13.8.1378.msi /qn TARGETDIR=C:\target
               <File Name="qwindows$(var.qt_suffix).dll"/>
             </Component>
           </Directory>
-<?if $(var.qt_ver_major) = "5" ?>
-          <Directory Id="printsupport" Name="printsupport" FileSource="$(var.qt_path)\..\plugins\printsupport">
-            <Component Id="windowsprintersupport.dll">
-              <File Name="windowsprintersupport$(var.qt_suffix).dll"/>
-            </Component>
-          </Directory>
-<?else ?>
           <Directory Id="tls" Name="tls" FileSource="$(var.qt_path)\..\plugins\tls">
             <Component Id="qopensslbackend.dll">
               <File Name="qopensslbackend$(var.qt_suffix).dll"/>
             </Component>
           </Directory>
-<?endif?>
           <Directory Id="styles" Name="styles" FileSource="$(var.qt_path)\..\plugins\styles">
             <Component Id="qwindowsvistastyle.dll">
               <File Name="qwindowsvistastyle$(var.qt_suffix).dll"/>
@@ -213,11 +196,7 @@ msiexec /a libdigidocpp-3.13.8.1378.msi /qn TARGETDIR=C:\target
 <?ifdef var.qt_path ?>
       <ComponentRef Id="qwindows.dll" />
       <ComponentRef Id="qwindowsvistastyle.dll" />
-<?if $(var.qt_ver_major) = "5" ?>
-      <ComponentRef Id="windowsprintersupport.dll" />
-<?else ?>
       <ComponentRef Id="qopensslbackend.dll" />
-<?endif?>
       <ComponentRef Id="imageformats.dll" />
 <?endif?>
     </Feature>