From 182173a944092bbb1a685497a542500cf5fe9079 Mon Sep 17 00:00:00 2001 From: Ayoub Kaanich Date: Tue, 18 Feb 2025 11:57:06 +0100 Subject: [PATCH 1/5] Update cmake.yml --- .github/workflows/cmake.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index a499de0..145e075 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -1,5 +1,4 @@ name: CMake - on: [push] env: From 3356ef13b8ab340d7f0dd6dbe895a5121fb25ed7 Mon Sep 17 00:00:00 2001 From: Ayoub Kaanich Date: Sun, 16 Nov 2025 00:00:35 +0100 Subject: [PATCH 2/5] Apply suggestion from @kayoub5 --- .github/workflows/cmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 145e075..cbb5ea9 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -14,7 +14,7 @@ jobs: include: - os: windows-latest - os: ubuntu-latest - - os: macos-12 + - os: macos-13 steps: - uses: actions/checkout@v4 From a05ec49e88527a13dea747178f961c73cfb24b1e Mon Sep 17 00:00:00 2001 From: Ayoub Kaanich Date: Sun, 16 Nov 2025 00:04:38 +0100 Subject: [PATCH 3/5] Update .github/workflows/cmake.yml --- .github/workflows/cmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index cbb5ea9..021fd9d 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -14,7 +14,7 @@ jobs: include: - os: windows-latest - os: ubuntu-latest - - os: macos-13 + - os: macos-latest steps: - uses: actions/checkout@v4 From fa07f35d7daa9f1831f1e1bdffffe75b25755aed Mon Sep 17 00:00:00 2001 From: Ayoub Kaanich Date: Sun, 16 Nov 2025 09:53:13 +0100 Subject: [PATCH 4/5] Apply suggestion from @kayoub5 --- .github/workflows/cmake.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 021fd9d..263d77e 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -20,7 +20,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 - run: | - pip3 install wheel conan==2.5.0 + pipx install conan conan --version cmake --version From bfa79dd8af9212c1a8c95e36139c90a4d5b18e1e Mon Sep 17 00:00:00 2001 From: Ayoub Kaanich Date: Sun, 16 Nov 2025 09:59:19 +0100 Subject: [PATCH 5/5] Upgrade pcapplusplus --- conanfile.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/conanfile.py b/conanfile.py index be3aabf..67ffc3d 100644 --- a/conanfile.py +++ b/conanfile.py @@ -19,11 +19,11 @@ class TecmpAppRecipe(ConanFile): # Sources are located in the same place as this recipe, copy them to the recipe exports_sources = "CMakeLists.txt", "src/*" - + package_folder = "../dist" - + def requirements(self): - self.requires("pcapplusplus/23.09") + self.requires("pcapplusplus/25.05") def layout(self): cmake_layout(self) @@ -43,4 +43,3 @@ def build(self): def package(self): cmake = CMake(self) cmake.install() -