Merge pull request #170 from Mahlet-Inc/develop

Develop
Mahlet-Inc · Apr 30, 2024 · 6869498 · 6869498
2 parents 1a6d569 + f1353cb
commit 6869498
Show file tree

Hide file tree

Showing 14 changed files with 62 additions and 23 deletions.
diff --git a/.github/workflows/dev-build.yml b/.github/workflows/dev-build.yml
@@ -1,4 +1,4 @@
-name: Build Hobbits
+name: Build and Test develop
 run-name: Build ${{ github.ref }} ${{ github.sha }}
 on:
   push:
@@ -9,7 +9,11 @@ on:
       - develop
 jobs:
   Build-Hobbits:
-    runs-on: ubuntu-22.04
+    runs-on: ${{ matrix.os }}
+    strategy:
+        matrix:
+            os: [ubuntu-22.04]
+
     steps:
       - uses: actions/setup-node@v3
         with:
@@ -41,5 +45,17 @@ jobs:
         run: ninja package -C build
       - uses: actions/upload-artifact@v3
         with:
-          name: DEB Packages
-          path: build/hobbits-*deb*
+          name: DEB Packages ${{ matrix.os }}
+          path: build/hobbits-*deb*
+
+  Check-Artifacts:
+    needs: Build-Hobbits
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/download-artifact@v3
+
+      - name: Check Files
+        run: ls -R
+
diff --git a/.github/workflows/prod-build.yml b/.github/workflows/prod-build.yml
@@ -1,12 +1,16 @@
-name: Build and Deploy Hobbits
+name: Build, Test and Release master
 run-name: Deploy ${{ github.ref }} ${{ github.sha }}
 on:
   push:
     branches:
       - master
 jobs:
   Build-Hobbits:
-    runs-on: ubuntu-22.04
+    runs-on: ${{ matrix.os }}
+    strategy:
+        matrix:
+            os: [ubuntu-22.04]
+
     steps:
       - uses: actions/setup-node@v3
         with:
@@ -44,11 +48,26 @@ jobs:
         run: ninja package -C build
       - uses: actions/upload-artifact@v3
         with:
-          name: DEB Packages
+          name: DEB Packages ${{ matrix.os }}
           path: build/hobbits-*deb*
 
+  Release-Hobbits:
+    needs: Build-Hobbits
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 14
+      - uses: actions/checkout@v3
+
+      - uses: actions/download-artifact@v3
+
+      - name: Check Files
+        run: ls -R
+
       - name: Semantic Release
         run: |
+          npm ci
           cp ci/full.releaserc.json .releaserc.json
           npx semantic-release
         env:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -127,9 +127,7 @@ else()
 	find_package(PkgConfig)
 
 	# Qt
-	find_package(Qt5Core CONFIG REQUIRED)
-	find_package(Qt5Widgets CONFIG REQUIRED)
-	find_package(Qt5Network CONFIG REQUIRED)
+	find_package(Qt5 5.15 REQUIRED COMPONENTS Core Widgets Network)
 
 	# libpcap
 	if (NOT WIN32)
@@ -167,7 +165,7 @@ elseif( MANUAL_PYTHON_PATH )
 	set ( Python3_ROOT_DIR "${MANUAL_PYTHON_PATH}" )
 endif()
 
-find_package (Python3 3.9 COMPONENTS Interpreter Development REQUIRED)
+find_package (Python3 3.8 COMPONENTS Interpreter Development REQUIRED)
 message("Python3 Libs: ${Python3_LIBRARIES}")
 
 #

diff --git a/README.md b/README.md
@@ -1,6 +1,7 @@
+[![Discord Chat](https://discordapp.com/api/guilds/672761400220844042/widget.png?style=shield)](https://discord.gg/wRQJpZZ)
+[![build, test, release master](https://github.com/Mahlet-Inc/hobbits/actions/workflows/prod-build.yml/badge.svg)](https://github.com/Mahlet-Inc/hobbits/actions/workflows/prod-build.yml)
+[![build, test develop](https://github.com/Mahlet-Inc/hobbits/actions/workflows/dev-build.yml/badge.svg?event=push)](https://github.com/Mahlet-Inc/hobbits/actions/workflows/dev-build.yml)
 
-[![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
-[![Discord Chat](https://discordapp.com/api/guilds/672761400220844042/widget.png?style=shield)](https://discord.gg/wRQJpZZ)  
 
 ## About
 Hobbits was developed at Mahlet in 2019 as an integrated data analysis tool. It was open-sourced

diff --git a/ci/full.releaserc.json b/ci/full.releaserc.json
@@ -25,7 +25,12 @@
             {
                 "assets": [
                     {
-                        "path": "build/hobbits*deb*"
+                        "path": "DEB Packages ubuntu-20.04/*.deb",
+                        "name": "DEB Package for Ubuntu 20.04"
+                    },
+                    {
+                        "path": "DEB Packages ubuntu-22.04/*.deb",
+                        "name": "DEB Package for Ubuntu 22.04"
                     }
                 ]
             }

diff --git a/cmake/PackExternalDeps.cmake b/cmake/PackExternalDeps.cmake
@@ -1,7 +1,7 @@
 
 function(pack_qt_libs)
 
-    get_target_property(QT_CORE_LIB Qt5::Core LOCATION)
+    get_target_property(QT_CORE_LIB Qt::Core LOCATION)
     if (APPLE)
         get_filename_component(CORE_FRAMEWORK_DIR "${QT_CORE_LIB}" DIRECTORY)
         get_filename_component(QT_LIB_DIR "${CORE_FRAMEWORK_DIR}" DIRECTORY)

diff --git a/src/hobbits-core/CMakeLists.txt b/src/hobbits-core/CMakeLists.txt
@@ -23,7 +23,7 @@ target_include_directories(hobbits-core INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}")
 if (BUILDING_WITH_CONAN)
 	set(ALL_LINK_LIBS CONAN_PKG::qt)
 else()
-	set(ALL_LINK_LIBS Qt5::Core Qt5::Widgets)
+	set(ALL_LINK_LIBS Qt::Core Qt::Widgets)
 endif()
 
 target_link_libraries(hobbits-core ${ALL_LINK_LIBS})

diff --git a/src/hobbits-gui/CMakeLists.txt b/src/hobbits-gui/CMakeLists.txt
@@ -19,7 +19,7 @@ file(GLOB RCFILES "${CMAKE_CURRENT_SOURCE_DIR}/*.qrc" "${CMAKE_CURRENT_SOURCE_DI
 if (BUILDING_WITH_CONAN)
 	set(ALL_LINK_LIBS hobbits-python hobbits-widgets hobbits-core CONAN_PKG::qt)
 else()
-	set(ALL_LINK_LIBS hobbits-python hobbits-widgets hobbits-core Qt5::Widgets)
+	set(ALL_LINK_LIBS hobbits-python hobbits-widgets hobbits-core Qt::Widgets)
 endif()
 
 add_executable(hobbits MACOSX_BUNDLE "${SRCFILES}" "${HDRFILES}" "${RCFILES}")

diff --git a/src/hobbits-plugins/CMakeLists.txt b/src/hobbits-plugins/CMakeLists.txt
@@ -18,7 +18,7 @@ macro(pluginInDir pluginType modName modDir)
 		if (BUILDING_WITH_CONAN)
 			set(ALL_LINK_LIBS hobbits-core hobbits-widgets CONAN_PKG::qt)
 		else()
-			set(ALL_LINK_LIBS hobbits-core hobbits-widgets Qt5::Core Qt5::Widgets)
+			set(ALL_LINK_LIBS hobbits-core hobbits-widgets Qt::Core Qt::Widgets)
 		endif()
 
         target_link_libraries("${pluginName}" PRIVATE ${ALL_LINK_LIBS})

diff --git a/src/hobbits-plugins/importerexporters/HttpData/CMakeLists.txt b/src/hobbits-plugins/importerexporters/HttpData/CMakeLists.txt
@@ -1,6 +1,6 @@
 pluginInDir("${pluginType}" "HttpData" "${CMAKE_CURRENT_SOURCE_DIR}")
 
 if (NOT BUILDING_WITH_CONAN)
-	target_link_libraries("hobbits-plugin-importerexporters-HttpData" PRIVATE Qt5::Network)
+	target_link_libraries("hobbits-plugin-importerexporters-HttpData" PRIVATE Qt::Network)
 endif()
 
diff --git a/src/hobbits-plugins/importerexporters/PacketCapture/CMakeLists.txt b/src/hobbits-plugins/importerexporters/PacketCapture/CMakeLists.txt
@@ -5,7 +5,7 @@ if (NOT WIN32)
 	if (BUILDING_WITH_CONAN)
 		target_link_libraries("hobbits-plugin-importerexporters-PacketCapture" PRIVATE CONAN_PKG::libpcap)
 	else()
-		target_link_libraries("hobbits-plugin-importerexporters-PacketCapture" PRIVATE ${PCAP_LIBRARY} Qt5::Network)
+		target_link_libraries("hobbits-plugin-importerexporters-PacketCapture" PRIVATE ${PCAP_LIBRARY} Qt::Network)
 	endif()
 
 endif()
diff --git a/src/hobbits-plugins/importerexporters/TcpData/CMakeLists.txt b/src/hobbits-plugins/importerexporters/TcpData/CMakeLists.txt
@@ -1,5 +1,5 @@
 pluginInDir("${pluginType}" "TcpData" "${CMAKE_CURRENT_SOURCE_DIR}")
 
 if (NOT BUILDING_WITH_CONAN)
-	target_link_libraries("hobbits-plugin-importerexporters-TcpData" PRIVATE Qt5::Network)
+	target_link_libraries("hobbits-plugin-importerexporters-TcpData" PRIVATE Qt::Network)
 endif()
diff --git a/src/hobbits-plugins/importerexporters/UdpData/CMakeLists.txt b/src/hobbits-plugins/importerexporters/UdpData/CMakeLists.txt
@@ -1,5 +1,5 @@
 pluginInDir("${pluginType}" "UdpData" "${CMAKE_CURRENT_SOURCE_DIR}")
 
 if (NOT BUILDING_WITH_CONAN)
-	target_link_libraries("hobbits-plugin-importerexporters-UdpData" PRIVATE Qt5::Network)
+	target_link_libraries("hobbits-plugin-importerexporters-UdpData" PRIVATE Qt::Network)
 endif()
diff --git a/src/hobbits-runner/CMakeLists.txt b/src/hobbits-runner/CMakeLists.txt
@@ -19,7 +19,7 @@ add_executable("hobbits-runner" "${SRCFILES}"  "${HDRFILES}" "${RCFILES}")
 if (BUILDING_WITH_CONAN)
 	set(ALL_LINK_LIBS hobbits-python hobbits-widgets hobbits-core CONAN_PKG::qt)
 else()
-	set(ALL_LINK_LIBS hobbits-python hobbits-widgets hobbits-core Qt5::Widgets)
+	set(ALL_LINK_LIBS hobbits-python hobbits-widgets hobbits-core Qt::Widgets)
 endif()
 
 target_link_libraries("hobbits-runner" ${ALL_LINK_LIBS})