Remove Qt5 Builds for Windows / Mac (#132)

Co-authored-by: Chris Rizzitello <crizzitello@ics.com>

.github/workflows/ci.yaml

@@ -52,54 +52,36 @@ jobs:
          name: "Linux-Qt5"
             , os: ubuntu-18.04
             , QT_VERSION: 5.15.2 , QT_INST_DIR: /opt
-            , QT_STRING: "Qt5"
+            , QT_STRING: "-Qt5"
             , extraCMakeConfig: "-DCMAKE_INSTALL_PREFIX=/usr -DQT_DEFAULT_MAJOR_VERSION=5"
           }
         - {
             name: "Linux-Qt6"
             , os: ubuntu-20.04
             , QT_VERSION: 6.3.0, QT_INST_DIR: /opt
-            , QT_STRING: "Qt6"
-            , extraCMakeConfig: "-DCMAKE_INSTALL_PREFIX=/usr -DQT_DEFAULT_MAJOR_VERSION=6"
+            , QT_STRING: "-Qt6"
+            , extraCMakeConfig: "-DCMAKE_INSTALL_PREFIX=/usr"
             , linuxDeployQtPath: "export PATH=$PATH:/opt/Qt/6.3.0/gcc_64/libexec"
           }
-        - {
-            name: "Mac-Qt5"
-            , os: macos-latest
-            , QT_VERSION: 5.15.2 , QT_INST_DIR: /Users/runner
-            , QT_STRING: "Qt5"
-            , extraCMakeConfig: "-DQT_DEFAULT_MAJOR_VERSION=5 -DNOTARIZE_AS=\"John Kennedy\""
-            , buildTarget: "--target package"
-          }
         - {
             name: "Mac-Qt6"
             , os: macos-latest
             , QT_VERSION: 6.3.0, QT_INST_DIR: /Users/runner
-            , QT_STRING: "Qt6"
-            , extraCMakeConfig: "-DQT_DEFAULT_MAJOR_VERSION=6 -DNOTARIZE_AS=\"John Kennedy\""
-            , buildTarget: "--target package"
-          }
-        - {
-            name: "Windows-Qt5", WIN_ARCH: "x64"
-            , os: windows-2019
-            , QT_VERSION: 5.15.2, QT_INST_DIR: "C:/", QTDIR: "C:/Qt/5.15.2/msvc2019_64", QT_ARCH: win64_msvc2019_64
-            , QT_STRING: "Qt5"
-            , extraCMakeConfig: "-G Ninja -DQT_DEFAULT_MAJOR_VERSION=5"
+            , extraCMakeConfig: "-DNOTARIZE_AS=\"John Kennedy\""
             , buildTarget: "--target package"
           }
         - {
             name: "Windows-Qt6", WIN_ARCH: "x64"
             , os: windows-2019
             , QT_VERSION: 6.3.0, QT_INST_DIR: "C:/", QTDIR: "C:/Qt/6.3.0/msvc2019_64", QT_ARCH: win64_msvc2019_64
-            , QT_STRING: "Qt6"
-            , extraCMakeConfig: "-G Ninja -DQT_DEFAULT_MAJOR_VERSION=6"
+            , extraCMakeConfig: "-G Ninja"
             , buildTarget: "--target package"
           }
     steps:
     - name: Setup env
       shell: bash
       run: |
-        echo "name=ashirt-${{ needs.run-info.outputs.sha8 }}-${{matrix.config.QT_STRING}}-$RUNNER_OS" >> $GITHUB_ENV
+        echo "name=ashirt-${{ needs.run-info.outputs.sha8 }}${{matrix.config.QT_STRING}}-$RUNNER_OS" >> $GITHUB_ENV
         echo "githash=${{ needs.run-info.outputs.sha8 }}" >> $GITHUB_ENV
         echo "signRelease=${{ needs.run-info.outputs.signRelease }}" >> $GITHUB_ENV
 
@@ -159,7 +141,7 @@ jobs:
             wget -qc "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage"
             wget -qc "https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage"
             chmod a+x linuxdeploy*.AppImage
-            export VERSION=${{ env.githash }}-${{ matrix.config.QT_STRING }}
+            export VERSION=${{ env.githash }}${{ matrix.config.QT_STRING }}
             ${{matrix.config.linuxDeployQtPath}}
             ./linuxdeploy-x86_64.AppImage --appdir=appdir  --output appimage \
                 -e ashirt \

CMakeLists.txt

@@ -54,7 +54,7 @@ endif()
      message(STATUS "VERSION: ${CMAKE_PROJECT_VERSION}")
 
 if(NOT QT_DEFAULT_MAJOR_VERSION)
-    set(QT_DEFAULT_MAJOR_VERSION 5 CACHE STRING "" FORCE)
+    set(QT_DEFAULT_MAJOR_VERSION 6 CACHE STRING "" FORCE)
 endif()
 
 find_package(Qt${QT_DEFAULT_MAJOR_VERSION} REQUIRED COMPONENTS

deploy/CMakeLists.txt

@@ -13,8 +13,12 @@ set(CPACK_PACKAGE_NAME "ashirt")
 if(NOT CPACK_PACKAGE_VERSION)
     set(CPACK_PACKAGE_VERSION ${CMAKE_PROJECT_VERSION})
 endif()
+set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
+    if(QT_DEFAULT_MAJOR_VERSION MATCHES "5")
+        STRING(APPEND CPACK_PACKAGE_FILE_NAME "-Qt5")
+    endif()
 if(CMAKE_SYSTEM_NAME MATCHES "Windows")
-    set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-Qt${QT_DEFAULT_MAJOR_VERSION}-Windows")
+    STRING(APPEND CPACK_PACKAGE_FILE_NAME "-Windows")
     set(CPACK_PACKAGE_INSTALL_DIRECTORY "ashirt")
     set(CPACK_NSIS_DISPLAY_NAME ${CMAKE_PACKAGE_NAME})
     set(CPACK_NSIS_COMPRESSOR lzma)
@@ -31,7 +35,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "Windows")
     )
     set(CPACK_GENERATOR "NSIS")
 elseif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
-    set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-Qt${QT_DEFAULT_MAJOR_VERSION}-macos")
+    STRING(APPEND CPACK_PACKAGE_FILE_NAME "-macOS")
     set(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/deploy/dmg_icon.icns")
     set(CPACK_DMG_BACKGROUND_IMAGE "${PROJECT_SOURCE_DIR}/deploy/dmg_background.png")
     set(CPACK_DMG_DS_STORE_SETUP_SCRIPT "${PROJECT_SOURCE_DIR}/deploy/generate_ds_store.applescript")