test

grodansparadis · Sep 20, 2024 · f4c0d1d · f4c0d1d
1 parent 6d8ae8a
commit f4c0d1d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 26 deletions.
diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml
@@ -23,13 +23,14 @@ jobs:
         submodules: recursive
 
     # https://github.com/marketplace/actions/install-qt
-    # - name: Install Qt
-    #   uses: jurplel/install-qt-action@v4
-    #   with:
-    #     version: '6.2.*'
-    #     target: 'desktop'
-    #     dir: '${{ github.workspace }}/qt/'
-    #     modules: 'qtcharts qtconnectivity qtserialbus qtserialport qtwebsockets'
+    - name: Install Qt
+      uses: jurplel/install-qt-action@v4
+      with:
+        version: 6.8.0
+        host: 'linux'
+        target: 'desktop'
+        arch: 'linux_gcc_64'
+        modules: 'qtcharts qtconnectivity qtserialbus qtserialport qtwebsockets'
 
     - name: Checkout vscp repo
       uses: actions/checkout@v4
@@ -69,17 +70,14 @@ jobs:
     - name: Install FUSE manually
       run: sudo apt install libfuse2  
 
-    # Note that both of libqt5serialport5 libqt5serialport5-dev is needed    
-    - name: Install qt5 components manually
-      run: sudo apt install qttools5-dev qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools qtdeclarative5-dev libqt5charts5-dev libqt5serialbus5-dev libqt5serialport5-dev
-
     - name: Setup cmake
       uses: jwlawson/actions-setup-cmake@v2
 
     - name: Create Build Environment
       run: |
         mkdir build && cd build
-        cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DVSCP_PATH=vscp/ 
+        cmake  -DCMAKE_BUILD_TYPE=Release  -DCMAKE_INSTALL_PREFIX=/usr -DVSCP_ROOT=${{github.workspace}}/vscp2/ -DVSCP_PATH=${{github.workspace}}/vscp/ ..
+ 
 
     - name: Build
       working-directory: ${{github.workspace}}/build

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -24,7 +24,6 @@ jobs:
         host: 'linux'
         target: 'desktop'
         arch: 'linux_gcc_64'
-        #dir: ${{ github.workspace }}/qt/
         modules: 'qtcharts qtconnectivity qtserialbus qtserialport qtwebsockets'
 
       # https://github.com/actions/checkout  
@@ -45,17 +44,6 @@ jobs:
         export VSCP_ROOT=${{github.workspace}}/vscp
         echo echo ${{env.VSCP_ROOT}}
 
-    # - name: test
-    #   run: |
-    #     export Qt6_DIR=${{env.QT_ROOT_DIR}}/lib/cmake/Qt6/
-    #     echo $Qt6_DIR
-    #     echo $QT_ROOT_DIR
-    #     export TTT=${{env.QT_ROOT_DIR}}/lib/cmake/Qt6/
-    #     echo "${{env.TTT}}"
-    #     echo "Hello"
-    #     echo $TTT
-    #     echo $Qt6_DIR
-
     - name: Checkout eclipse paho repo
       uses: actions/checkout@v4
       with:
@@ -86,13 +74,12 @@ jobs:
     - name: Setup cmake
       uses: jwlawson/actions-setup-cmake@v2 
 
-    #        cmake  -DCMAKE_BUILD_TYPE=Release  -DCMAKE_INSTALL_PREFIX=/usr -DVSCP_ROOT=${{github.workspace}}/vscp/ -DVSCP_PATH=${{github.workspace}}/vscp/ -DCMAKE_PREFIX_PATH=$QT_ROOT_DIR -DQt6_DIR=$Qt6_DIR -DQT_ADDITIONAL_PACKAGES_PREFIX_PATH=/home/runner/work/vscp-works-qt/vscp-works-qt/qt/Qt/6.8.0/gcc_64/lib/cmake/Qt6 ..  
     - name: Create Build Environment
       run: |
         mkdir build && cd build
         cmake  -DCMAKE_BUILD_TYPE=Release  -DCMAKE_INSTALL_PREFIX=/usr -DVSCP_ROOT=${{github.workspace}}/vscp2/ -DVSCP_PATH=${{github.workspace}}/vscp/ ..
 
-    - name: Build
+    - name: Build vscp-works-qt
       working-directory: ${{github.workspace}}/build
       shell: bash
       # Execute the build.  You can specify a specific target with "--target <NAME>"