App: add log information

KangLin · Feb 24, 2025 · adb850f · adb850f
1 parent 6e9bada
commit adb850f
Show file tree

Hide file tree

Showing 12 changed files with 131 additions and 95 deletions.
diff --git a/.github/workflows/aarch64.yml b/.github/workflows/aarch64.yml
@@ -53,7 +53,7 @@ jobs:
           cmake -E make_directory ${{env.INSTALL_DIR}}
 
       - name: Cache installed
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: cache-installed
         with:
           path: |

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -16,7 +16,7 @@ jobs:
       matrix:
         BUILD_TYPE: [Release]
         qt_arch: [android_arm64_v8a, android_x86_64]
-        qt_version: [6.8.2]
+        qt_version: [6.9.0]
         include:
           - qt_arch: android_arm64_v8a
             VCPKG_TARGET_TRIPLET: arm64-android
@@ -33,7 +33,7 @@ jobs:
 
     env:
       RabbitRemoteControl_VERSION: v0.0.32
-      VCPKGGITCOMMITID: 9f5925e81bbcd9c8c34cc7a8bd25e3c557b582b2
+      VCPKGGITCOMMITID: d5ec528843d29e3a52d745a64b469f810b2cedbf
       VCPKG_TARGET_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}
       VCPKG_DEFAULT_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}
       VCPKG_DEFAULT_HOST_TRIPLET: x64-linux
@@ -74,7 +74,7 @@ jobs:
           sudo apt install -y -q ninja-build nasm
 
       - name: Cache installed
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         id: cache-installed
         with:
           path: |
@@ -95,7 +95,7 @@ jobs:
 
       - name: Install Qt of linux_gcc_64
         uses: jurplel/install-qt-action@v4
-        if: ${{ matrix.qt_version == '6.8.2' }}
+        if: ${{ matrix.qt_version == '6.9.0' }}
         with:
           dir: '${{env.TOOLS_DIR}}/qt' # optional
           version: '${{matrix.qt_version}}'

diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml
@@ -18,14 +18,12 @@ jobs:
       matrix:
         BUILD_TYPE: [Release]
         qt_version: [6.8.2]
-        os: [ubuntu-24.04, ubuntu-24.04-arm, ubuntu-22.04-arm]
+        os: [ubuntu-24.04, ubuntu-24.04-arm]
         include:
           - os: ubuntu-24.04
             qt_arch: "linux_gcc_64"
           - os: ubuntu-24.04-arm
             qt_arch: "linux_gcc_arm64"
-          - os: ubuntu-22.04-arm
-            qt_arch: "linux_gcc_arm64"
 
     # See: [About GitHub-hosted runners](https://docs.github.com/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners)
     # See: [Choosing the runner for a job](https://docs.github.com/actions/writing-workflows/choosing-where-your-workflow-runs/choosing-the-runner-for-a-job)
@@ -37,9 +35,9 @@ jobs:
       BUILD_DIR:   ${{github.workspace}}/build
       SOURCE_DIR:  ${{github.workspace}}/.cache/source
       TOOLS_DIR:   ${{github.workspace}}/.cache/tools
-      INSTALL_DIR: ${{github.workspace}}/.cache/install_${{matrix.os}}_${{matrix.qt_arch}}_${{matrix.BUILD_TYPE}}
+      INSTALL_DIR: ${{github.workspace}}/.cache/install_${{matrix.qt_arch}}_${{matrix.BUILD_TYPE}}
       RabbitRemoteControl_VERSION: v0.0.32
-      artifact_name: build_appimage_${{matrix.os}}
+      artifact_name: build_appimage
       qt_modules: 'qtscxml qtmultimedia qtimageformats qtserialport qt5compat'
 
     # Map the job outputs to step outputs
@@ -60,13 +58,14 @@ jobs:
           cmake -E make_directory ${{env.INSTALL_DIR}}
 
       - name: Cache installed
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: cache-installed
         with:
           path: |
             ${{env.INSTALL_DIR}}
             ${{env.TOOLS_DIR}}/linuxdeploy-*
-          key: install_ubuntu
+            ${{env.TOOLS_DIR}}/qt_*
+          key: install_appimage
 
       - name: git clone RabbitCommon
         working-directory: ${{env.SOURCE_DIR}}
@@ -75,18 +74,16 @@ jobs:
 
       - name: Install dependency libraries
         run: |
-          sudo ./Script/build_depend.sh --apt_update --base \
+          sudo ./Script/build_depend.sh --apt_update --base --qt ${{matrix.qt_version}} \
               --tigervnc --freerdp --pcapplusplus \
               --install ${{env.INSTALL_DIR}} \
               --source ${{env.SOURCE_DIR}} \
               --tools ${{env.TOOLS_DIR}} \
               --build ${{env.BUILD_DIR}}
-          if [ "ubuntu-22.04-arm" != ${{matrix.os}} ]; then
-              sudo apt install -y -q qt6-5compat-dev
-          fi
 
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
+        if: false
         with:
           dir: '${{env.TOOLS_DIR}}/qt'
           version: ${{matrix.qt_version}}
@@ -97,7 +94,6 @@ jobs:
           cache: true
           cache-key-prefix: cached-qt_${{matrix.qt_arch}}
 
-
       - name: build appimage
         env:
           RabbitCommon_ROOT: ${{env.SOURCE_DIR}}/RabbitCommon
@@ -114,7 +110,11 @@ jobs:
           PcapPlusPlus_DIR: ${{env.INSTALL_DIR}}/lib/cmake/pcapplusplus
         run: |
           #export QMAKE=$QT_ROOT_DIR/bin/qmake6
-          export QMAKE=$Qt6_DIR/bin/qmake6
+          export QT_ROOT=${{env.TOOLS_DIR}}/qt_`uname -m`
+          export Qt6_DIR=$QT_ROOT
+          export QMAKE=$QT_ROOT/bin/qmake
+          export LD_LIBRARY_PATH=$QT_ROOT/lib
+          export QT_PLUGIN_PATH=$QT_ROOT/plugins
           ${{github.workspace}}/Script/build_appimage.sh
           md5sum RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_Linux_`uname -m`.AppImage > RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_Linux_`uname -m`.AppImage.md5sum
 
@@ -142,7 +142,7 @@ jobs:
         if: ${{ matrix.BUILD_TYPE == 'Release' }}
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ env.artifact_name }}
+          name: ${{ env.artifact_name }}_${{matrix.os}}
           path: |
             ${{github.workspace}}/RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_*.AppImage
             ${{github.workspace}}/update_appimage_${{matrix.qt_arch}}_qt${{matrix.qt_version}}.json
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -55,17 +55,30 @@ jobs:
         with:
           submodules: false
 
+      - name: clean test tag
+        if: ${{ startsWith(github.ref, 'refs/heads/master') }}
+        continue-on-error: true
+        run: |
+          gh release delete test_${{ github.ref_name }} -y --cleanup-tag
+
       - name: Download ubuntu
         uses: actions/download-artifact@v4
         with:
-          name: ${{ needs.ubuntu.outputs.name }}
+          pattern: ${{ needs.ubuntu.outputs.name }}*
+          path: ${{ env.artifact_path }}
+          merge-multiple: true
+
+      - name: Download appimage
+        uses: actions/download-artifact@v4
+        with:
+          pattern: ${{ needs.appimage.outputs.name }}*
           path: ${{ env.artifact_path }}
           merge-multiple: true
 
       - name: Download msvc
         uses: actions/download-artifact@v4
         with:
-          pattern: ${{ needs.msvc.outputs.name }}_*
+          pattern: ${{ needs.msvc.outputs.name }}*
           path: ${{ env.artifact_path }}
           merge-multiple: true
 
@@ -80,14 +93,14 @@ jobs:
       - name: Download macos
         uses: actions/download-artifact@v4
         with:
-          pattern: ${{ needs.macos.outputs.name }}_*
+          pattern: ${{ needs.macos.outputs.name }}*
           path: ${{ env.artifact_path }}
           merge-multiple: true
 
       - name: Download android
         uses: actions/download-artifact@v4
         with:
-          pattern: ${{ needs.android.outputs.name }}_*
+          pattern: ${{ needs.android.outputs.name }}*
           path: ${{ env.artifact_path }}
           merge-multiple: true
 
@@ -98,19 +111,6 @@ jobs:
           path: ${{ env.artifact_path }}
           merge-multiple: true
 
-      - name: Download appimage
-        uses: actions/download-artifact@v4
-        with:
-          name: ${{ needs.appimage.outputs.name }}
-          path: ${{ env.artifact_path }}
-          merge-multiple: true
-
-      - name: clean test tag
-        if: ${{ startsWith(github.ref, 'refs/heads/master') }}
-        continue-on-error: true
-        run: |
-          gh release delete test_${{ github.ref_name }} -y --cleanup-tag
-
       - name: Process configure file
         run: |
           git clone https://github.com/KangLin/RabbitCommon.git
@@ -154,14 +154,19 @@ jobs:
           done
 
       # See: [访问有关工作流运行的上下文信息](https://docs.github.com/actions/writing-workflows/choosing-what-your-workflow-does/accessing-contextual-information-about-workflow-runs#github-context)
-      - name: Upload To Github Release
+      - name: Create Github Release
         if: ${{ startsWith(github.ref, 'refs/tags/') }}
+        continue-on-error: true
         run: |
           gh release create ${{ github.ref_name }} --title ${{ github.ref_name }} --notes-file ${{github.workspace}}/Note.md
+
+      - name: Upload To Github Release
+        if: ${{ startsWith(github.ref, 'refs/tags/') }}
+        run: |
           gh release upload ${{ github.ref_name }} ${{github.workspace}}/${{ env.artifact_path }}/* ${{github.workspace}}/Note.md ${{github.workspace}}/update.json
 
       - name: Upload test tag To Github Release
         if: ${{ startsWith(github.ref, 'refs/heads/master') }}
         run: |
           gh release create test_${{ github.ref_name }} --prerelease --latest=false --title "Recently developed build - ${{ github.ref_name }}" --notes-file ${{github.workspace}}/Note.md
-          gh release upload test_${{ github.ref_name }} ${{github.workspace}}/${{ env.artifact_path }}/* ${{github.workspace}}/Note.md ${{github.workspace}}/update.json --clobber
+          gh release upload test_${{ github.ref_name }} --clobber ${{github.workspace}}/${{ env.artifact_path }}/* ${{github.workspace}}/Note.md ${{github.workspace}}/update.json --clobber
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -18,11 +18,11 @@ jobs:
       matrix:
         # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
         BUILD_TYPE: [Release, Debug]
-        qt_version: [6.8.2, 5.15.2, 5.12.12]
+        qt_version: [6.9.0, 5.15.2, 5.12.12]
         qt_arch: [clang_64]
         VCPKG_TARGET_TRIPLET: [x64-osx]
         include:
-          - qt_version: 6.8.2
+          - qt_version: 6.9.0
             qt_modules: qtscxml qtmultimedia qtserialport qt5compat
 
           - qt_version: 5.15.2
@@ -41,7 +41,7 @@ jobs:
       TOOLS_DIR:   ${{github.workspace}}/.cache/tools
       INSTALL_DIR: ${{github.workspace}}/.cache/install
       qt_modules: ${{matrix.qt_modules}}
-      VCPKGGITCOMMITID: 9f5925e81bbcd9c8c34cc7a8bd25e3c557b582b2
+      VCPKGGITCOMMITID: d5ec528843d29e3a52d745a64b469f810b2cedbf
       VCPKG_TARGET_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}
       VCPKG_DEFAULT_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}
       VCPKG_MANIFEST_FEATURES: "freerdp;vnc;wol"
@@ -67,7 +67,7 @@ jobs:
           cmake -E make_directory ${{env.INSTALL_DIR}}_qt${{matrix.qt_version}}_${{matrix.qt_arch}}_${{matrix.BUILD_TYPE}}
 
       - name: Cache installed
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: cache-installed
         with:
           path: |
@@ -291,7 +291,7 @@ jobs:
           7z a RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_macos.zip ./install/*
 
       - name: Update configure file
-        if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.8.2' }}
+        if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.9.0' }}
         working-directory: ${{github.workspace}}/build
         run: |
           ${{env.SOURCE_DIR}}/RabbitCommon/Install/GenerateJsonFile.sh \
@@ -301,7 +301,7 @@ jobs:
                "https://github.com/KangLin/RabbitRemoteControl/releases/download/v${{env.RabbitRemoteControl_VERSION}}/RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_macos.zip;https://sourceforge.net/projects/rabbitRabbitRemoteControl/files/v${{env.RabbitRemoteControl_VERSION}}/RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_macos.zip"
 
       - name: Update artifact
-        if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.8.2' }}
+        if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.9.0' }}
         uses: actions/upload-artifact@v4
         with:
           name: ${{ env.artifact_name }}_${{matrix.qt_version}}_${{matrix.qt_arch}}

diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml
@@ -77,7 +77,7 @@ jobs:
           cmake -E make_directory ${{env.INSTALL_DIR}}
     
       - name: Cache installed
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: cache-installed
         with:
           path: |

diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml
@@ -13,9 +13,9 @@ jobs:
     strategy:
       matrix:
         BUILD_TYPE: [Release, Debug]
-        qt_version: [6.8.1, 5.15.2, 5.12.12]
+        qt_version: [6.9.0, 5.15.2, 5.12.12]
         include:
-          - qt_version: 6.8.1
+          - qt_version: 6.9.0
             qt_arch: win64_msvc2022_64
             qt_modules: qtscxml qtmultimedia qtimageformats qtserialport qt5compat
             CMAKE_GENERATOR_PLATFORM: x64
@@ -46,7 +46,7 @@ jobs:
       SOURCE_DIR:  ${{github.workspace}}\.cache\source
       TOOLS_DIR:   ${{github.workspace}}\.cache\tools
       INSTALL_DIR: ${{github.workspace}}\.cache\install
-      VCPKGGITCOMMITID: 9f5925e81bbcd9c8c34cc7a8bd25e3c557b582b2
+      VCPKGGITCOMMITID: d5ec528843d29e3a52d745a64b469f810b2cedbf
       VCPKG_TARGET_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}
       VCPKG_DEFAULT_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}
       VCPKG_PLATFORM_TOOLSET: ${{matrix.VCPKG_PLATFORM_TOOLSET}}
@@ -80,7 +80,7 @@ jobs:
           cmake -E make_directory ${{env.INSTALL_DIR}}
           
       - name: Cache installed
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: cache-installed
         with:
           path: |
@@ -313,7 +313,7 @@ jobs:
         run: git clone https://github.com/KangLin/RabbitCommon.git
 
       - name: Build RabbitRemoteControl with cmake preset
-        if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.8.1' && startsWith(github.ref, 'refs/heads/master')}}
+        if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.9.0' && startsWith(github.ref, 'refs/heads/master')}}
         working-directory: ${{github.workspace}}
         env:
           RabbitCommon_ROOT: ${{env.SOURCE_DIR}}/RabbitCommon
@@ -415,7 +415,7 @@ jobs:
             ${{github.workspace}}\build\update_msvc_${{matrix.qt_arch}}_qt${{matrix.qt_version}}.json
 
       - name: Update artifact update_windows.xml
-        if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.8.1' }}
+        if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.9.0' }}
         uses: actions/upload-artifact@v4
         with:
           name: ${{ env.artifact_name }}_${{matrix.qt_version}}_${{matrix.qt_arch}}_xml

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       matrix:
         BUILD_TYPE: [Release, Debug]
-        os: [ubuntu-24.04, ubuntu-24.04-arm, ubuntu-22.04-arm]
+        os: [ubuntu-24.04, ubuntu-24.04-arm]
 
     # See: [About GitHub-hosted runners](https://docs.github.com/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners)
     # See: [Choosing the runner for a job](https://docs.github.com/actions/writing-workflows/choosing-where-your-workflow-runs/choosing-the-runner-for-a-job)
@@ -31,7 +31,7 @@ jobs:
       TOOLS_DIR:   ${{github.workspace}}/.cache/tools
       INSTALL_DIR: ${{github.workspace}}/.cache/install_${{matrix.os}}_${{matrix.BUILD_TYPE}}
       RabbitRemoteControl_VERSION: 0.0.32
-      artifact_name: build_${{matrix.os}}
+      artifact_name: build_ubuntu
 
     # Map the job outputs to step outputs
     outputs:
@@ -89,7 +89,7 @@ jobs:
           cmake -E make_directory ${{env.INSTALL_DIR}}
 
       - name: Cache installed
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: cache-installed
         with:
           path: |
@@ -191,7 +191,7 @@ jobs:
         if: ${{ matrix.BUILD_TYPE == 'Release' }}
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ env.artifact_name }}
+          name: ${{ env.artifact_name }}_${{matrix.os}}
           path: |
             ${{github.workspace}}/rabbitremotecontrol_*.deb
             ${{github.workspace}}/update_ubuntu.json