Modify ci

KangLin · May 5, 2023 · 3ce9232 · 3ce9232
1 parent cc79a16
commit 3ce9232
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 42 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -3,9 +3,7 @@ name: android
 on: [push]
 
 jobs:
-  use_install_qt:
-    name: use install qt android_${{matrix.os}}-qt${{matrix.qt_version}}-${{matrix.VCPKG_TARGET_TRIPLET}}-${{matrix.BUILD_TYPE}}
-
+  build_android:
     strategy:
       matrix:
         BUILD_TYPE: [Release]
@@ -18,7 +16,7 @@ jobs:
             qt_version: 6.2.4
             qt_arch: android_armv7
             ANDROID_ABI: armeabi-v7a
-            qt_modules: 'qtscxml qtmultimedia qtwebview qtimageformats'
+            qt_modules: 'qtscxml qtwebengine qtmultimedia qtimageformats qtserialport'
 
     runs-on: ${{ matrix.os }}
 
@@ -124,7 +122,7 @@ jobs:
                 -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} \
                 -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} \
                 -DCMAKE_TOOLCHAIN_FILE=${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake \
-                -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=$ANDROID_NDK_HOME/build/cmake/android.toolchain.cmake \
+                -DVCPKG_CHAINLbuildOAD_TOOLCHAIN_FILE=$ANDROID_NDK_HOME/build/cmake/android.toolchain.cmake \
                 -DANDROID_ABI=${{matrix.ANDROID_ABI}} \
                 -DANDROID_PLATFORM=${{matrix.ANDROID_PLATFORM}}
             cmake --build . --config ${{ matrix.BUILD_TYPE }}

diff --git a/.github/workflows/doxygen.yml b/.github/workflows/doxygen.yml
@@ -6,7 +6,7 @@ env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
 jobs:
-  build:
+  build_doxygen:
     runs-on: ubuntu-latest
     env:
       BUILD_TYPE:  Release

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -1,4 +1,4 @@
-name: build_macos
+name: macos
 
 on:
   workflow_call:
@@ -9,22 +9,21 @@ on:
 
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  
+
 jobs:
   build_macos:
     strategy:
       matrix:
         # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
         BUILD_TYPE: [Release, Debug]
-        qt_version: [5.15.2, 5.12.12]
+        qt_version: [6.5.0, 5.15.2, 5.12.12]
         include:
-#          - qt_version: 6.4.2
-#            qt_modules: qtscxml qtpositioning qt5compat
+          - qt_version: 6.5.0
+            qt_modules: qtscxml qtmultimedia qtserialport qtimageformats
 
           - qt_version: 5.15.2
-            qt_modules: ""
+
           - qt_version: 5.12.12
-            qt_modules: ""
 
     runs-on: macos-latest
 
@@ -33,7 +32,7 @@ jobs:
       SOURCE_DIR:  ${{github.workspace}}/.cache/source
       TOOSL_DIR:   ${{github.workspace}}/.cache/tools
       INSTALL_DIR: ${{github.workspace}}/.cache/install_macos_qt${{matrix.qt_version}}_${{matrix.BUILD_TYPE}}
-      qt_modules: ${{matrix.qt_modules}}
+      qt_modules: qtwebengine ${{matrix.qt_modules}}
       RabbitRemoteControl_VERSION: v1.0.9
       VCPKGGITCOMMITID: 2b1757dd1d5ed7d9d5bb65fd8316631b157e7afc
       artifact_name: build_macos
@@ -152,16 +151,14 @@ jobs:
           key: qt${{matrix.qt_version}}-${{matrix.qt_arch}}
 
       - name: Install Qt
-        # You may pin to the exact commit or the version.
-        # uses: jurplel/install-qt-action@a962fb91949c8e846a3e4a944d50e7ef5cc3a28a
         uses: jurplel/install-qt-action@v3
         with:
-          # Directory to install Qt
-          dir: ${{env.TOOSL_DIR}}/qt # optional
-          # Version of Qt to install
-          version: ${{matrix.qt_version}} # optional, default is 5.15.2
-          modules: ${{env.qt_modules}} # optional
-
+          dir: '${{env.TOOSL_DIR}}/qt' # optional
+          version: '${{matrix.qt_version}}' # optional, default is 5.15.2
+          arch: '${{matrix.qt_arch}}' # optional
+          modules: '${{env.qt_modules}}' # optional
+          cached: '${{steps.cache-qt.outputs.cache-hit}}' # optional, default is false
+ 
       - name: build QtService
         working-directory: ${{env.SOURCE_DIR}}
         env:
@@ -189,7 +186,6 @@ jobs:
               -DCMARK_SHARED=OFF \
               -DCMARK_TESTS=OFF \
               -DCMARK_STATIC=ON \
-              -Dcmark-gfm_DIR=${{env.INSTALL_DIR}}/lib/cmake \
               -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} \
               -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/build/install \
               -DCMAKE_PREFIX_PATH=${{env.INSTALL_DIR}}/lib/cmake \

diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml
@@ -1,4 +1,4 @@
-name: build_mingw
+name: mingw
 
 on:
   workflow_call:
@@ -9,7 +9,6 @@ on:
 
 jobs:
   build_mingw:
-    name: build mingw
 
     strategy:
       matrix:

diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml
@@ -1,4 +1,4 @@
-name: build_msvc
+name: msvc
 
 on:
   workflow_call:
@@ -13,14 +13,14 @@ jobs:
     strategy:
       matrix:
         BUILD_TYPE: [Release, Debug]
-        qt_version: [5.15.2, 5.12.12]
+        qt_version: [6.5.0, 5.15.2, 5.12.12]
         include:
-#          - qt_version: 6.4.2
-#            triplet: x64-windows
-#            VCPKG_PLATFORM_TOOLSET: v142
-#            qt_arch: win64_msvc2019_64
-#            CMAKE_GENERATOR_PLATFORM: x64
-#            qt_modules: qtscxml qtpositioning
+          - qt_version: 6.5.0
+            triplet: x64-windows
+            VCPKG_PLATFORM_TOOLSET: v142
+            qt_arch: win64_msvc2019_64
+            CMAKE_GENERATOR_PLATFORM: x64
+            qt_modules: qtscxml qtmultimedia qtimageformats qtserialport
 
           - qt_version: 5.15.2
             triplet: x64-windows
@@ -51,7 +51,7 @@ jobs:
     # Map the job outputs to step outputs
     outputs:
       name: ${{ env.artifact_name }}
-      
+
     defaults:
       run:
         shell: cmd
@@ -247,7 +247,7 @@ jobs:
 
       - name: git clone RabbitCommon
         working-directory: ${{env.SOURCE_DIR}}
-        run: git clone -b v2 https://github.com/KangLin/RabbitCommon.git
+        run: git clone https://github.com/KangLin/RabbitCommon.git
 
       - name: build RabbitRemoteControl
         working-directory: ${{github.workspace}}\build

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -84,7 +84,7 @@ jobs:
       - name: git clone RabbitCommon
         working-directory: ${{env.SOURCE_DIR}}
         run: |
-            git clone -b v2 https://github.com/KangLin/RabbitCommon.git
+            git clone https://github.com/KangLin/RabbitCommon.git
 
       - name: Install apt packages
         run: |
@@ -182,19 +182,16 @@ jobs:
 
       - name: build QtService
         working-directory: ${{env.SOURCE_DIR}}
-        env:
-          QT_ROOT: /usr/lib/`uname -m`-linux-gnu/qt5
         run: |
           if [ ! -d ${{env.INSTALL_DIR}}/lib/cmake/QtService ]; then
             git clone https://github.com/KangLin/qt-solutions.git
             cd qt-solutions/qtservice
             git submodule update --init --recursive
             cmake -E make_directory build
             cd build
+            export Qt6_DIR=/usr/lib/`uname-a`-linux-gnu/cmake/Qt6
             cmake .. -DCMAKE_BUILD_TYPE=${{ matrix.BUILD_TYPE }} \
-                -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }} \
-                -DQT_DIR=${{env.QT_ROOT}}/lib/cmake/Qt5 \
-                -DQt5_DIR=${{env.QT_ROOT}}/lib/cmake/Qt5
+                -DCMAKE_INSTALL_PREFIX=${{ env.INSTALL_DIR }}
             cmake --build . --config ${{ matrix.BUILD_TYPE }}
             cmake --build . --config ${{ matrix.BUILD_TYPE }} --target install/strip
           fi

diff --git a/debian/rules b/debian/rules
@@ -93,7 +93,7 @@ endif
 	dh $@
 
 # dh_make generated override targets
-# This is example for Cmake (See https://bugs.debian.org/641051 )
+# This is example for Cmake ( See https://bugs.debian.org/641051 )
 override_dh_auto_configure:
 	dh_auto_configure -- -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
             -DBUILD_FREERDP=ON \