unique naming structure for lin/mac/win artifacts/assets

Signed-off-by: Martin <Ho-Ro@users.noreply.github.com>

Author: Ho-Ro

.github/workflows/build_check.yml

@@ -8,24 +8,30 @@ env:
   # CMake build type (Release, Debug, RelWithDebInfo, etc.)
   BUILD_TYPE: Release
 
+
 jobs:
   build_check:
     strategy:
       # do not stop on 1st fail
       fail-fast: false
       matrix:
-        # GitHub hosted runners do not support Qt on Windows
         # use Ubuntu1804 until Debian "bullseye" becomes "stable"
         os: [ubuntu-18.04, macos-10.15, windows-2019]
 
     runs-on: ${{ matrix.os }}
 
+
     steps:
 
+
+    # --- Clone the latest commit ---
+
     - name: Checkout
       uses: actions/checkout@v2
 
 
+    # --- Linux (Ubuntu) steps ---
+
     - name: Install Ubuntu Build Requirements
       if: startsWith(matrix.os, 'ubuntu')
       run:
@@ -36,23 +42,28 @@ jobs:
         cp ../CHANGELOG changelog;
         cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE
 
+
     - name: Ubuntu Build
       # GitHub hosts Linux runners on Standard_DS2_v2 virtual machines in Microsoft Azure:
       # 2-core CPU, 7 GB of RAM memory, 14 GB of SSD disk space
       working-directory: ${{github.workspace}}/build
       if: startsWith(matrix.os, 'ubuntu')
       run:
         make -j8;
-        fakeroot make -j8 package
+        fakeroot make -j8 package;
+        ls -l packages
+
 
     - name: Upload Ubuntu Artifacts
+      # *.deb *.rpm *.tgz
       if: startsWith(matrix.os, 'ubuntu')
       uses: actions/upload-artifact@v2
       with:
         name: openhantek_linux_amd64_${{github.run_number}}
         path: ${{github.workspace}}/build/packages/
 
 
+    # --- macOS steps ---
 
     - name: Install macOS Build Requirements
       if: startsWith(matrix.os, 'macos')
@@ -65,6 +76,7 @@ jobs:
         cp ../CHANGELOG changelog;
         cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_PREFIX_PATH=${Qt5_DIR}
 
+
     - name: macOS Build
       # GitHub hosts macOS runners in GitHub's own macOS Cloud:
       # 3-core CPU, 14 GB of RAM memory, 14 GB of SSD disk space
@@ -91,7 +103,8 @@ jobs:
         if test -f OpenHantek.dmg; then
         sudo mv OpenHantek.dmg ../packages/$(basename ../packages/openhantek_*_osx_*.tar.gz .tar.gz).dmg;
         fi;
-        cd ..; 
+        cd ..;
+        ls -l packages;
         else true; 
         fi
 
@@ -104,49 +117,52 @@ jobs:
         path: ${{github.workspace}}/build/packages/*.dmg
 
 
+    # --- Windows steps ---
 
     - name: Install Qt for Windows
       if: startsWith(matrix.os, 'windows')
       uses: jurplel/install-qt-action@v2
 
+
     - name: Install Windows Build Requirements
       if: startsWith(matrix.os, 'windows')
       run:
         md build &
         call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat" &
         cmake -G "Visual Studio 16 2019" -A x64 -DCMAKE_PREFIX_PATH=%Qt5_DIR% -DCMAKE_BUILD_TYPE=Release -Bbuild
 
+
     - name: Windows Build
       # GitHub hosts Windows runners on Standard_DS2_v2 virtual machines in Microsoft Azure:
       # 2-core CPU, 7 GB of RAM memory, 14 GB of SSD disk space
       working-directory: ${{github.workspace}}/build
       if: startsWith(matrix.os, 'windows')
+      shell: bash
       run:
-        cmake --build . --config Release --target package
+        cmake --build . --parallel 8 --config Release --target package;
+        ZIP=$(basename packages/openhantek_*_win_x64.zip);
+        rm -f packages/openhantek_*_win_x64.*;
+        cd openhantek/Release;
+        7z a ../../packages/$ZIP *;
+        cd ../..;
+        ls -l packages;
 
 
     - name: Upload Windows Artifacts
       if: startsWith(matrix.os, 'windows')
       uses: actions/upload-artifact@v2
       with:
-        name: OpenHantek_Win_x64_${{github.run_number}}
-        path: ${{github.workspace}}/build/openhantek/Release
+        name: openhantek_win_x64_${{github.run_number}}
+        path: ${{github.workspace}}/build/packages/*.zip
 
 
+    # --- Tagged Commit -> Upload Release ---
 
-    - name: Upload Linux / macOS Release Assets
+    - name: Upload Linux / macOS / Windows Release Assets
+      if: startsWith(github.ref, 'refs/tags/')
       uses: softprops/action-gh-release@v1
-      if: ${{ startsWith(github.ref, 'refs/tags/') && ( startsWith(matrix.os, 'macos') || startsWith(matrix.os, 'ubuntu') ) }}
       with:
         files: ${{github.workspace}}/build/packages/*
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-
-    - name: Upload Windows Release Assets
-      uses: softprops/action-gh-release@v1
-      if: ${{ startsWith(github.ref, 'refs/tags/') && startsWith(matrix.os, 'windows') }}
-      with:
-        files: ${{github.workspace}}/build/openhantek/Release/*
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

cmake/CPackInfos.cmake

@@ -122,11 +122,11 @@ if (UNIX)
 
 elseif(WIN32)
     set(CPACK_TARGET "win_")
-    set(CPACK_GENERATOR ${CPACK_GENERATOR} ZIP NSIS)
+    set(CPACK_GENERATOR ${CPACK_GENERATOR} ZIP)
     if ((MSVC AND CMAKE_GENERATOR MATCHES "Win64+") OR (CMAKE_SIZEOF_VOID_P EQUAL 8))
-        set(CPACK_ARCH "amd64")
+        set(CPACK_ARCH "x64")
     else()
-        set(CPACK_ARCH "x86")
+        set(CPACK_ARCH "x32")
     endif()
 endif()
 

cmake/copy_qt5_dlls_to_bin_dir.cmake

@@ -8,10 +8,8 @@ endif()
 if (MSVC)
     add_custom_command(TARGET ${PROJECT_NAME}
         POST_BUILD
-        #if (EXISTS "${QT5_BIN_DIR}/qtenv2.bat")
-        #  COMMAND "${QT5_BIN_DIR}/qtenv2.bat"
-        #endif()
-        COMMAND "${QT5_BIN_DIR}/windeployqt" --no-translations "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>/${PROJECT_NAME}.exe"
+        # COMMAND "${QT5_BIN_DIR}/qtenv2.bat"
+        COMMAND "${QT5_BIN_DIR}/windeployqt" --no-translations --compiler-runtime "${CMAKE_CURRENT_BINARY_DIR}/$<CONFIGURATION>/${PROJECT_NAME}.exe"
         WORKING_DIRECTORY "${QT5_BIN_DIR}"
         COMMENT "Copy Qt5 dlls for ${PROJECT_NAME}"
     )
@@ -21,10 +19,8 @@ else()
     endif()
     add_custom_command(TARGET ${PROJECT_NAME}
         POST_BUILD
-        #if (EXISTS "${QT5_BIN_DIR}/qtenv2.bat")
-        #    COMMAND "${QT5_BIN_DIR}/qtenv2.bat"
-        #endif()
-        COMMAND "${QT5_BIN_DIR}/windeployqt" --no-translations ${ADD_OPT} "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.exe"
+        # COMMAND "${QT5_BIN_DIR}/qtenv2.bat"
+        COMMAND "${QT5_BIN_DIR}/windeployqt" --no-translations --compiler-runtime ${ADD_OPT} "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.exe"
         WORKING_DIRECTORY "${QT5_BIN_DIR}"
         COMMENT "Copy Qt5 dlls for ${PROJECT_NAME}"
     )

openhantek/src/OH_BUILD.h

@@ -1,2 +1,2 @@
 // Do not edit, will be re-created at each commit!
-#define OH_BUILD "20210409 build 0"
+#define OH_BUILD "20210411 build 0"