remove Win32 support because Qt6 does not support it anymore

Murmele · Oct 8, 2023 · e468b2b · e468b2b
1 parent 93e49b3
commit e468b2b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 45 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -166,23 +166,6 @@ jobs:
               CXX: clang++
             pack: 1
 
-          - name: win32
-            os: windows-latest
-            ninja_platform: win
-            qt_platform: windows
-            qt_arch: win32_msvc2019
-            qt_arch_check_only: win32_msvc2017
-            openssl_arch: VC-WIN32
-            msvc_arch: x86
-            cmake_flags: "-DUSE_BUNDLED_ZLIB=1"
-            cmake_env:
-              CMAKE_RC_FLAGS: "/C 1252"
-              CC: clang
-              CXX: clang++
-              CMAKE_C_FLAGS: -m32
-              CMAKE_CXX_FLAGS: -m32
-            pack: 1
-
     steps:
       # otherwise the testcases will fail, because signature is invalid
       - name: Set git name and email
@@ -358,7 +341,6 @@ jobs:
           automatic_release_tag: 'development'
           files: |
             **/artifacts/Gittyup win64/Gittyup*.exe
-            **/artifacts/Gittyup win32/Gittyup*.exe
             **/artifacts/Gittyup macos/Gittyup*.dmg
             **/artifacts/Gittyup Flatpak/com.github.Murmele.Gittyup.yml
             **/Gittyup-x86_64/*.flatpak
@@ -373,7 +355,6 @@ jobs:
           automatic_release_tag: ${{ github.ref_name }}
           files: |
             **/artifacts/Gittyup win64/Gittyup*.exe
-            **/artifacts/Gittyup win32/Gittyup*.exe
             **/artifacts/Gittyup macos/Gittyup*.dmg
             **/artifacts/Gittyup Flatpak/com.github.Murmele.Gittyup.yml
             **/Gittyup-x86_64/*.flatpak

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -1,6 +1,6 @@
 # Define test macro.
 macro(test)
-  cmake_parse_arguments(ARG "NO_WIN32_OFFSCREEN" "NAME" "" ${ARGN})
+  cmake_parse_arguments(ARG "" "NAME" "" ${ARGN})
 
   add_executable(test_${ARG_NAME} ${ARG_NAME}.cpp)
   target_link_libraries(test_${ARG_NAME} testlib)
@@ -15,24 +15,13 @@ macro(test)
   add_test(NAME ${ARG_NAME} COMMAND $<TARGET_FILE:test_${ARG_NAME}>)
   add_dependencies(check_build test_${ARG_NAME})
 
-  if(${ARG_NO_WIN32_OFFSCREEN})
-    set_property(
-      TEST ${ARG_NAME}
-      APPEND
-      PROPERTY LABELS "NO_WIN32_OFFSCREEN")
-  endif()
-
   if(WIN32)
     find_package(Qt6Gui)
     string(REPLACE ";" "\;" NEWPATH "$ENV{PATH}")
     string(REPLACE ";" "\;" PLUGIN_PATH
                    "$<TARGET_FILE_DIR:Qt6::QOffscreenIntegrationPlugin>")
 
-    if(${ARG_NO_WIN32_OFFSCREEN})
-      set(PLATFORM "windows")
-    else()
-      set(PLATFORM "offscreen")
-    endif()
+    set(PLATFORM "offscreen")
 
     set_tests_properties(
       ${ARG_NAME}
@@ -57,15 +46,6 @@ add_custom_target(
   COMMENT "Running tests..."
   USES_TERMINAL)
 
-# Add check target excluding NO_WIN32_OFFSCREEN tests.
-add_custom_target(
-  check_no_win32_offscreen
-  COMMAND ${CMAKE_CTEST_COMMAND} --force-new-ctest-process --output-on-failure
-          --timeout 300 --label-exclude NO_WIN32_OFFSCREEN
-  DEPENDS check_build
-  COMMENT "Running tests..."
-  USES_TERMINAL)
-
 enable_testing()
 
 # Add test library.
@@ -92,10 +72,10 @@ test(NAME bare_repo)
 test(NAME init_repo)
 test(NAME merge)
 test(NAME external_tools_dialog)
-test(NAME branches_panel NO_WIN32_OFFSCREEN)
-test(NAME editor NO_WIN32_OFFSCREEN)
+test(NAME branches_panel)
+test(NAME editor)
 test(NAME index)
-test(NAME line_endings NO_WIN32_OFFSCREEN)
+test(NAME line_endings)
 test(NAME log)
 test(NAME main_window)
 test(NAME new_branch_dialog)
@@ -110,7 +90,7 @@ test(NAME referencelist)
 test(NAME amend)
 test(NAME SshConfig)
 test(NAME store)
-test(NAME fileContextMenu NO_WIN32_OFFSCREEN)
+test(NAME fileContextMenu)
 test(NAME Setting)
 test(NAME commitMessageTemplate)
 test(NAME commitEditor)