reorder GitHub runner script

Signed-off-by: Martin Homuth-Rosemann <horo@guardi.fritz.box>

Author: Martin Homuth-Rosemann

.github/workflows/build.yml

@@ -35,7 +35,7 @@ jobs:
 # --- Linux (Ubuntu) amd64 steps ---
 # ----------------------------------
 #
-  linux-x86_64:
+  linux-amd64:
     runs-on: ubuntu-24.04
     steps:
 
@@ -59,7 +59,7 @@ jobs:
         echo "git_describe=$(git describe)"
         echo "git_describe=$(git describe)" >> $GITHUB_OUTPUT
 
-    - name: Install Ubuntu Build Requirements
+    - name: Install Linux amd64 Build Requirements
       run: |
         mkdir build
         sudo apt update
@@ -69,7 +69,7 @@ jobs:
           libqt6core6t64 libqt6gui6 libqt6widgets6 libqt6printsupport6 \
           libqt6opengl6 libqt6openglwidgets6 qt6-tools-dev
 
-    - name: Ubuntu Build
+    - name: Linux amd64 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
@@ -80,14 +80,14 @@ jobs:
         fakeroot make -j8 package
         ls -l packages
 
-    - name: Upload Ubuntu Artifacts
+    - name: Upload Linux amd64 Artifacts
       # *.deb *.rpm *.tgz
       uses: actions/upload-artifact@v4
       with:
         name: openhantek_${{ steps.config_git.outputs.git_describe }}_linux_amd64
         path: ${{github.workspace}}/build/packages/*
 
-    - name: Upload Linux Release Assets
+    - name: Upload Linux amd64 Release Assets
       if: startsWith(github.ref, 'refs/tags/')
       uses: softprops/action-gh-release@v1
       with:
@@ -125,7 +125,7 @@ jobs:
         echo "git_describe=$(git describe)"
         echo "git_describe=$(git describe)" >> $GITHUB_OUTPUT
 
-    - name: Install Ubuntu Build Requirements
+    - name: Install Linux arm64 Build Requirements
       run: |
         mkdir build
         sudo apt update
@@ -135,7 +135,7 @@ jobs:
           libqt6core6t64 libqt6gui6 libqt6widgets6 libqt6printsupport6 \
           libqt6opengl6 libqt6openglwidgets6 qt6-tools-dev
 
-    - name: Ubuntu Build
+    - name: Linux arm64 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
@@ -146,14 +146,14 @@ jobs:
         fakeroot make -j8 package
         ls -l packages
 
-    - name: Upload Ubuntu Artifacts
+    - name: Upload Linux arm64 Artifacts
       # *.deb *.rpm *.tgz
       uses: actions/upload-artifact@v4
       with:
         name: openhantek_${{ steps.config_git.outputs.git_describe }}_linux_arm64
         path: ${{github.workspace}}/build/packages/*
 
-    - name: Upload Linux Release Assets
+    - name: Upload Linux arm64 Release Assets
       if: startsWith(github.ref, 'refs/tags/')
       uses: softprops/action-gh-release@v1
       with:
@@ -164,10 +164,10 @@ jobs:
 
 
 # -------------------------
-# --- macOS intel steps ---
+# --- macOS amd64 steps ---
 # -------------------------
 #
-  macos-intel:
+  macos-amd64:
     runs-on: macos-13
     steps:
 
@@ -191,7 +191,7 @@ jobs:
         echo "git_describe=$(git describe)"
         echo "git_describe=$(git describe)" >> $GITHUB_OUTPUT
 
-    - name: Install macOS Build Requirements
+    - name: Install macOS intel Build Requirements
       run: |
         mkdir build
         brew install qt@6 fftw binutils create-dmg || true
@@ -234,7 +234,7 @@ jobs:
     - name: Upload macOS intel Artifacts
       uses: actions/upload-artifact@v4
       with:
-        name: openhantek_${{ steps.config_git.outputs.git_describe }}_osx_intel
+        name: openhantek_${{ steps.config_git.outputs.git_describe }}_macos_amd64
         path: ${{github.workspace}}/build/packages/*
 
     - name: Upload macOS intel Release Assets
@@ -318,7 +318,7 @@ jobs:
     - name: Upload macOS arm64 Artifacts
       uses: actions/upload-artifact@v4
       with:
-        name: openhantek_${{ steps.config_git.outputs.git_describe }}_osx_arm64
+        name: openhantek_${{ steps.config_git.outputs.git_describe }}_macos_arm64
         path: ${{github.workspace}}/build/packages/*
 
     - name: Upload macOS arm64 Release Assets
@@ -331,6 +331,77 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
 
+# --------------------------
+# --- Windows MSVC steps ---
+# --------------------------
+#
+  windows-msvc_x64:
+    runs-on: windows-2022
+    steps:
+
+    # --- Clone the latest commit ---
+    - name: Checkout
+      uses: actions/checkout@v3
+      with:
+        fetch-tags: true
+        submodules: recursive
+        fetch-depth: 0
+
+    # --- Config git and get the version from "git describe" ---
+    - name: Config Git
+      id: config_git
+      shell: bash
+      run: |
+        git config user.email "Ho-Ro@users.noreply.github.com"
+        git config user.name "Ho-Ro"
+        git fetch --tags --force || true
+        git submodule update --init --recursive
+        echo "git_describe=$(git describe)"
+        echo "git_describe=$(git describe)" >> $GITHUB_OUTPUT
+
+    - name: Install Qt for Windows
+      uses: jurplel/install-qt-action@v4
+
+    - name: Setup Windows MSVC Build
+      run:
+        md build &
+        call "%VCINSTALLDIR%/Auxiliary/Build/vcvars64.bat" &
+        cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_PREFIX_PATH=%Qt6_DIR% -DCMAKE_BUILD_TYPE=Release -Bbuild
+
+    - name: Windows MSVC 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
+      shell: bash
+      run: |
+        cmake --build . --parallel 8 --config Release --target package
+        ZIP=$(basename packages/openhantek_*_msvc_x64.zip)
+        rm -f packages/openhantek_*_msvc_x64.*
+        cd openhantek/Release
+        7z a ../../packages/$ZIP *
+        cd ../..
+        ls -l packages
+
+    - name: Upload Windows MSVC Artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: openhantek_${{ steps.config_git.outputs.git_describe }}_msvc_x64
+        path: ./build/packages/*.zip
+
+    - name: Upload Windows MSVC Release Assets
+      if: startsWith(github.ref, 'refs/tags/')
+      uses: softprops/action-gh-release@v1
+      with:
+        prerelease: true
+        files: ./build/packages/*
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+
+############################################
+# The MINGW build is currently not working #
+############################################
+
 # # ---------------------------
 # # --- Windows MINGW steps ---
 # # ---------------------------
@@ -383,16 +454,16 @@ jobs:
 #       shell: bash
 #       run: |
 #         # this ZIP package contains only OpenHantek.exe, just get the name
-#         ZIP=$(basename packages/openhantek_*_mingw_x64.zip)
-#         rm -f packages/openhantek_*_mingw_x64.*
+#         ZIP=$(basename packages/openhantek_*_mingw_amd64.zip)
+#         rm -f packages/openhantek_*_mingw_amd64.*
 #         cd openhantek
 #         7z a ../packages/$ZIP *.exe driver documents
 #         ls -l ../packages
 
 #     - name: Upload Windows Artifacts
 #       uses: actions/upload-artifact@v4
 #       with:
-#         name: openhantek_${{ steps.config_git.outputs.git_describe }}_mingw_x64
+#         name: openhantek_${{ steps.config_git.outputs.git_describe }}_mingw_amd64
 #         path: ./build/packages/*.zip
 
 #     - name: Upload Windows Release Assets
@@ -404,70 +475,3 @@ jobs:
 #       env:
 #         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-
-# --------------------------
-# --- Windows MSVC steps ---
-# --------------------------
-#
-  windows-msvc_x64:
-    runs-on: windows-2022
-    steps:
-
-    # --- Clone the latest commit ---
-    - name: Checkout
-      uses: actions/checkout@v3
-      with:
-        fetch-tags: true
-        submodules: recursive
-        fetch-depth: 0
-
-    # --- Config git and get the version from "git describe" ---
-    - name: Config Git
-      id: config_git
-      shell: bash
-      run: |
-        git config user.email "Ho-Ro@users.noreply.github.com"
-        git config user.name "Ho-Ro"
-        git fetch --tags --force || true
-        git submodule update --init --recursive
-        echo "git_describe=$(git describe)"
-        echo "git_describe=$(git describe)" >> $GITHUB_OUTPUT
-
-    - name: Install Qt for Windows
-      uses: jurplel/install-qt-action@v4
-
-    - name: Setup Windows MSVC Build
-      run:
-        md build &
-        call "%VCINSTALLDIR%/Auxiliary/Build/vcvars64.bat" &
-        cmake -G "Visual Studio 17 2022" -A x64 -DCMAKE_PREFIX_PATH=%Qt6_DIR% -DCMAKE_BUILD_TYPE=Release -Bbuild
-
-    - name: Windows MSVC 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
-      shell: bash
-      run: |
-        cmake --build . --parallel 8 --config Release --target package
-        ZIP=$(basename packages/openhantek_*_msvc_x64.zip)
-        rm -f packages/openhantek_*_msvc_x64.*
-        cd openhantek/Release
-        7z a ../../packages/$ZIP *
-        cd ../..
-        ls -l packages
-
-    - name: Upload Windows MSVC Artifacts
-      uses: actions/upload-artifact@v4
-      with:
-        name: openhantek_${{ steps.config_git.outputs.git_describe }}_msvc_x64
-        path: ./build/packages/*.zip
-
-    - name: Upload Windows MSVC Release Assets
-      if: startsWith(github.ref, 'refs/tags/')
-      uses: softprops/action-gh-release@v1
-      with:
-        prerelease: true
-        files: ./build/packages/*
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-

cmake/CPackInfos.cmake

@@ -1,5 +1,5 @@
 # This file configures CPack.
-# A tgz, deb and rpm file is created for Linux (tgz and deb tested on debian stretch and buster).
+# A tgz, deb and rpm file is created for Linux (tgz and deb tested on debian trixie).
 # A tar.gz file is created for macOS (not tested).
 # A zip file is created on Windows (not tested).
 
@@ -39,7 +39,7 @@ if (UNIX)
             DESTINATION etc/devd
         )
     elseif(APPLE)
-        set(CPACK_TARGET "osx_")
+        set(CPACK_TARGET "macos_")
     endif()
 
     # install documentation
@@ -93,13 +93,13 @@ set(CPACK_STRIP_FILES 1)
 
 include(CMakeDetermineSystem)
 
-# Linux DEB (tested on debian stable "bullseye")
+# Linux DEB (tested on debian stable "trixie")
 # Architecture for package and file name are automatically detected
 set(CPACK_DEBIAN_PACKAGE_SECTION "electronics")
 # do not detect depencencies and versions automatically
 # set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
 # use deb stable packages without version explicitely to support also legacy installations
-# local build uses Debian stable (currently trixie)
+# local build uses Debian stable (currently "trixie")
 # CI build (github actions) uses Ubuntu 24.04 LTS as long as Debian "trixie" is "stable"
 set(CPACK_DEBIAN_PACKAGE_DEPENDS "libfftw3-double3, libqt6core6, libqt6gui6, libqt6widgets6, libqt6opengl6, libqt6openglwidgets6, libqt6printsupport6, libusb-1.0")
 message( "-- Depends: ${CPACK_DEBIAN_PACKAGE_DEPENDS}" )