From 90c62e34b4fd7511c5c7e8ed9bfb8db96aef8e55 Mon Sep 17 00:00:00 2001 From: Leonardo Parente <23251360+leoparente@users.noreply.github.com> Date: Fri, 5 Sep 2025 18:18:54 -0300 Subject: [PATCH 01/18] chore: fix GHA --- .github/workflows/build_cross.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_cross.yml b/.github/workflows/build_cross.yml index a841a39f1..dc905d7b2 100644 --- a/.github/workflows/build_cross.yml +++ b/.github/workflows/build_cross.yml @@ -21,18 +21,18 @@ jobs: include: - arch: x86_64 conan_arch: x86_64 - toolchain: http://musl.cc/x86_64-linux-musl-cross.tgz + toolchain: https://musl.cc/x86_64-linux-musl-cross.tgz cc: x86_64-linux-musl-gcc cxx: x86_64-linux-musl-g++ ldflags: "-static" # - arch: armv7lh # ARMv7 little-endian hard-float # conan_arch: armv7hf - # toolchain: http://musl.cc/armv7l-linux-musleabihf-cross.tgz + # toolchain: https://musl.cc/armv7l-linux-musleabihf-cross.tgz # cc: armv7l-linux-musleabihf-gcc # cxx: armv7l-linux-musleabihf-g++ - arch: aarch64 conan_arch: armv8 - toolchain: http://musl.cc/aarch64-linux-musl-cross.tgz + toolchain: https://musl.cc/aarch64-linux-musl-cross.tgz cc: aarch64-linux-musl-gcc cxx: aarch64-linux-musl-g++ ldflags: "-static" From 3d50ff1c9bd98db057c82a3dd0313b7c2d61f2bc Mon Sep 17 00:00:00 2001 From: Leonardo Parente <23251360+leoparente@users.noreply.github.com> Date: Fri, 5 Sep 2025 18:40:07 -0300 Subject: [PATCH 02/18] test fix --- .github/workflows/build-develop.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-develop.yml b/.github/workflows/build-develop.yml index 67258aed7..7ca93248c 100644 --- a/.github/workflows/build-develop.yml +++ b/.github/workflows/build-develop.yml @@ -47,7 +47,9 @@ jobs: restore-keys: conan-${{ runner.os }}- - name: Detect Conan Profile - run: conan profile detect -f + run: | + conan profile detect -f + conan profile update 'conf.tools.build:cxxflags=["-include","vector"]' default - name: Configure CMake shell: bash From a70130545bd750b61e17dbf5227396c8d61e88f4 Mon Sep 17 00:00:00 2001 From: Leonardo Parente <23251360+leoparente@users.noreply.github.com> Date: Sat, 6 Sep 2025 10:45:07 -0300 Subject: [PATCH 03/18] try do add conf --- .github/workflows/build-develop.yml | 5 +++-- .github/workflows/build-release.yml | 2 +- cmake/conan_provider.cmake | 13 ++++++++++--- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-develop.yml b/.github/workflows/build-develop.yml index 7ca93248c..13f7c29ec 100644 --- a/.github/workflows/build-develop.yml +++ b/.github/workflows/build-develop.yml @@ -49,7 +49,8 @@ jobs: - name: Detect Conan Profile run: | conan profile detect -f - conan profile update 'conf.tools.build:cxxflags=["-include","vector"]' default + grep -qxF '[conf]' build/profiles/default || echo '[conf]' >> build/profiles/default + echo 'corrade/*:tools.build:cxxflags=["-include","vector"]' >> build/profiles/default - name: Configure CMake shell: bash @@ -110,7 +111,7 @@ jobs: run: sudo ctest --output-on-failure build-win64: - runs-on: windows-2019 + runs-on: windows-latest outputs: version_number: ${{ env.VERSION }} steps: diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index b6aefab12..44aa5e498 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -155,7 +155,7 @@ jobs: prerelease: false build-win64: - runs-on: windows-2019 + runs-on: windows-latest outputs: version_number: ${{ env.VERSION }} steps: diff --git a/cmake/conan_provider.cmake b/cmake/conan_provider.cmake index 2a01f0408..5f71be451 100644 --- a/cmake/conan_provider.cmake +++ b/cmake/conan_provider.cmake @@ -50,6 +50,9 @@ function(detect_os os os_api_level os_sdk os_subsystem os_version) elseif(CMAKE_SYSTEM_NAME MATCHES "^MSYS") set(${os} Windows PARENT_SCOPE) set(${os_subsystem} msys2 PARENT_SCOPE) + elseif(CMAKE_SYSTEM_NAME STREQUAL "Emscripten") + # https://github.com/emscripten-core/emscripten/blob/4.0.6/cmake/Modules/Platform/Emscripten.cmake#L17C1-L17C34 + set(${os} Emscripten PARENT_SCOPE) else() set(${os} ${CMAKE_SYSTEM_NAME} PARENT_SCOPE) endif() @@ -123,6 +126,10 @@ function(detect_arch arch) elseif(host_arch MATCHES "AMD64|amd64|x86_64|x64") set(_arch x86_64) endif() + if(EMSCRIPTEN) + # https://github.com/emscripten-core/emscripten/blob/4.0.6/cmake/Modules/Platform/Emscripten.cmake#L294C1-L294C80 + set(_arch wasm) + endif() message(STATUS "CMake-Conan: cmake_system_processor=${_arch}") set(${arch} ${_arch} PARENT_SCOPE) endfunction() @@ -268,15 +275,15 @@ function(detect_compiler compiler compiler_version compiler_runtime compiler_run elseif(_compiler MATCHES AppleClang) set(_compiler "apple-clang") - string(REPLACE "." ";" VERSION_LIST ${CMAKE_CXX_COMPILER_VERSION}) + string(REPLACE "." ";" VERSION_LIST ${_compiler_version}) list(GET VERSION_LIST 0 _compiler_version) elseif(_compiler MATCHES Clang) set(_compiler "clang") - string(REPLACE "." ";" VERSION_LIST ${CMAKE_CXX_COMPILER_VERSION}) + string(REPLACE "." ";" VERSION_LIST ${_compiler_version}) list(GET VERSION_LIST 0 _compiler_version) elseif(_compiler MATCHES GNU) set(_compiler "gcc") - string(REPLACE "." ";" VERSION_LIST ${CMAKE_CXX_COMPILER_VERSION}) + string(REPLACE "." ";" VERSION_LIST ${_compiler_version}) list(GET VERSION_LIST 0 _compiler_version) endif() From ce2283ccbd7a06be32e2206bb5bb53ff97996a98 Mon Sep 17 00:00:00 2001 From: Leonardo Parente <23251360+leoparente@users.noreply.github.com> Date: Sat, 6 Sep 2025 11:17:55 -0300 Subject: [PATCH 04/18] try cmake command --- .github/workflows/build-develop.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-develop.yml b/.github/workflows/build-develop.yml index 13f7c29ec..40147780d 100644 --- a/.github/workflows/build-develop.yml +++ b/.github/workflows/build-develop.yml @@ -49,13 +49,13 @@ jobs: - name: Detect Conan Profile run: | conan profile detect -f - grep -qxF '[conf]' build/profiles/default || echo '[conf]' >> build/profiles/default - echo 'corrade/*:tools.build:cxxflags=["-include","vector"]' >> build/profiles/default + #grep -qxF '[conf]' build/profiles/default || echo '[conf]' >> build/profiles/default + #echo 'corrade/*:tools.build:cxxflags=["-include","vector"]' >> build/profiles/default - name: Configure CMake shell: bash working-directory: ${{github.workspace}}/build - run: PKG_CONFIG_PATH=${{github.workspace}}/local/lib/pkgconfig cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=./cmake/conan_provider.cmake + run: PKG_CONFIG_PATH=${{github.workspace}}/local/lib/pkgconfig cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=./cmake/conan_provider.cmake -D"CONAN_CONF=corrade/*:tools.build:cxxflags=['-include','vector']" - name: Build working-directory: ${{github.workspace}}/build From 4a08d490a5fa37b44c8e5f1cbc865d1359d16341 Mon Sep 17 00:00:00 2001 From: Leonardo Parente <23251360+leoparente@users.noreply.github.com> Date: Sat, 6 Sep 2025 11:25:15 -0300 Subject: [PATCH 05/18] try command --- .github/workflows/build-develop.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-develop.yml b/.github/workflows/build-develop.yml index 40147780d..c470e0cff 100644 --- a/.github/workflows/build-develop.yml +++ b/.github/workflows/build-develop.yml @@ -55,7 +55,9 @@ jobs: - name: Configure CMake shell: bash working-directory: ${{github.workspace}}/build - run: PKG_CONFIG_PATH=${{github.workspace}}/local/lib/pkgconfig cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=./cmake/conan_provider.cmake -D"CONAN_CONF=corrade/*:tools.build:cxxflags=['-include','vector']" + run: PKG_CONFIG_PATH=${{github.workspace}}/local/lib/pkgconfig cmake $GITHUB_WORKSPACE \ + -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=./cmake/conan_provider.cmake \ + -DCONAN_INSTALL_ARGS="--build=missing;-c=corrade/*:tools.build:cxxflags=['-include','vector']" - name: Build working-directory: ${{github.workspace}}/build From 0ace6a2a0165532c948c7e1e0a3ad654cc3ad489 Mon Sep 17 00:00:00 2001 From: Leonardo Parente <23251360+leoparente@users.noreply.github.com> Date: Sat, 6 Sep 2025 11:32:37 -0300 Subject: [PATCH 06/18] single line --- .github/workflows/build-develop.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build-develop.yml b/.github/workflows/build-develop.yml index c470e0cff..1e751381a 100644 --- a/.github/workflows/build-develop.yml +++ b/.github/workflows/build-develop.yml @@ -55,9 +55,7 @@ jobs: - name: Configure CMake shell: bash working-directory: ${{github.workspace}}/build - run: PKG_CONFIG_PATH=${{github.workspace}}/local/lib/pkgconfig cmake $GITHUB_WORKSPACE \ - -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=./cmake/conan_provider.cmake \ - -DCONAN_INSTALL_ARGS="--build=missing;-c=corrade/*:tools.build:cxxflags=['-include','vector']" + run: PKG_CONFIG_PATH=${{github.workspace}}/local/lib/pkgconfig cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=./cmake/conan_provider.cmake -DCONAN_INSTALL_ARGS="--build=missing;-c=corrade/*:tools.build:cxxflags=['-include','vector']" - name: Build working-directory: ${{github.workspace}}/build From 094ede3f8dd2687d7aead530c3915360a6827652 Mon Sep 17 00:00:00 2001 From: Leonardo Parente <23251360+leoparente@users.noreply.github.com> Date: Sat, 6 Sep 2025 14:52:37 -0300 Subject: [PATCH 07/18] remove comment --- .github/workflows/build-develop.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build-develop.yml b/.github/workflows/build-develop.yml index 1e751381a..1c82a4d89 100644 --- a/.github/workflows/build-develop.yml +++ b/.github/workflows/build-develop.yml @@ -49,8 +49,6 @@ jobs: - name: Detect Conan Profile run: | conan profile detect -f - #grep -qxF '[conf]' build/profiles/default || echo '[conf]' >> build/profiles/default - #echo 'corrade/*:tools.build:cxxflags=["-include","vector"]' >> build/profiles/default - name: Configure CMake shell: bash From f3a1e937df76269415b2ce7f9d14d34beafd1d20 Mon Sep 17 00:00:00 2001 From: Leonardo Parente <23251360+leoparente@users.noreply.github.com> Date: Sat, 6 Sep 2025 15:10:46 -0300 Subject: [PATCH 08/18] test links --- .github/workflows/build_cross.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_cross.yml b/.github/workflows/build_cross.yml index dc905d7b2..402955783 100644 --- a/.github/workflows/build_cross.yml +++ b/.github/workflows/build_cross.yml @@ -21,18 +21,18 @@ jobs: include: - arch: x86_64 conan_arch: x86_64 - toolchain: https://musl.cc/x86_64-linux-musl-cross.tgz + toolchain: https://github.com/cross-tools/musl-cross/releases/download/20250815/x86_64-unknown-linux-musl.tar.xz cc: x86_64-linux-musl-gcc cxx: x86_64-linux-musl-g++ ldflags: "-static" # - arch: armv7lh # ARMv7 little-endian hard-float # conan_arch: armv7hf - # toolchain: https://musl.cc/armv7l-linux-musleabihf-cross.tgz + # toolchain: https://github.com/cross-tools/musl-cross/releases/download/20250815/armv7-unknown-linux-musleabihf.tar.xz # cc: armv7l-linux-musleabihf-gcc # cxx: armv7l-linux-musleabihf-g++ - arch: aarch64 conan_arch: armv8 - toolchain: https://musl.cc/aarch64-linux-musl-cross.tgz + toolchain: https://github.com/cross-tools/musl-cross/releases/download/20250815/aarch64-unknown-linux-musl.tar.xz cc: aarch64-linux-musl-gcc cxx: aarch64-linux-musl-g++ ldflags: "-static" From 9a219157f4dde513cf58bc2e17caf226a1d184e3 Mon Sep 17 00:00:00 2001 From: Leonardo Parente <23251360+leoparente@users.noreply.github.com> Date: Sat, 6 Sep 2025 15:15:55 -0300 Subject: [PATCH 09/18] fix unzip command --- .github/workflows/build_cross.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_cross.yml b/.github/workflows/build_cross.yml index 402955783..a4d18de4c 100644 --- a/.github/workflows/build_cross.yml +++ b/.github/workflows/build_cross.yml @@ -67,7 +67,7 @@ jobs: if: steps.cache-toolchain.outputs.cache-hit != 'true' run: | mkdir -p toolchain - curl -L "${{matrix.toolchain}}" | tar -C toolchain -xz --strip-components=1 + curl -L "${{matrix.toolchain}}" | tar -C toolchain -xJ --strip-components=1 - name: Install Conan run: pip install --no-cache-dir conan --force-reinstall From e2883743999d0e3178e5f329f76c96a2ccedf31d Mon Sep 17 00:00:00 2001 From: Leonardo Parente <23251360+leoparente@users.noreply.github.com> Date: Sat, 6 Sep 2025 15:20:35 -0300 Subject: [PATCH 10/18] fix path --- .github/workflows/build_cross.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_cross.yml b/.github/workflows/build_cross.yml index a4d18de4c..f4f3dd9ed 100644 --- a/.github/workflows/build_cross.yml +++ b/.github/workflows/build_cross.yml @@ -22,8 +22,8 @@ jobs: - arch: x86_64 conan_arch: x86_64 toolchain: https://github.com/cross-tools/musl-cross/releases/download/20250815/x86_64-unknown-linux-musl.tar.xz - cc: x86_64-linux-musl-gcc - cxx: x86_64-linux-musl-g++ + cc: x86_64-unknown-linux-musl-gcc + cxx: x86_64-unknown-linux-musl-g++ ldflags: "-static" # - arch: armv7lh # ARMv7 little-endian hard-float # conan_arch: armv7hf @@ -33,8 +33,8 @@ jobs: - arch: aarch64 conan_arch: armv8 toolchain: https://github.com/cross-tools/musl-cross/releases/download/20250815/aarch64-unknown-linux-musl.tar.xz - cc: aarch64-linux-musl-gcc - cxx: aarch64-linux-musl-g++ + cc: aarch64-unknown-linux-musl-gcc + cxx: aarch64-unknown-linux-musl-g++ ldflags: "-static" env: CC: gcc From 19403ab346e43693f16634802125663d7d54ad62 Mon Sep 17 00:00:00 2001 From: Leonardo Parente <23251360+leoparente@users.noreply.github.com> Date: Sat, 6 Sep 2025 15:47:41 -0300 Subject: [PATCH 11/18] update otelcpp --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 2a01b519a..8be67dc7b 100644 --- a/conanfile.py +++ b/conanfile.py @@ -20,7 +20,7 @@ def requirements(self): self.requires("libpcap/1.10.5", force=True) else: self.requires("npcap/1.70") - self.requires("opentelemetry-cpp/1.17.0") + self.requires("opentelemetry-cpp/1.21.0") self.requires("pcapplusplus/23.09") self.requires("protobuf/5.27.0") self.requires("sigslot/1.2.2") From c651e28bc1f8b6e7618bb3bc2fe5e08a9573136c Mon Sep 17 00:00:00 2001 From: Leonardo Parente <23251360+leoparente@users.noreply.github.com> Date: Sat, 6 Sep 2025 15:52:19 -0300 Subject: [PATCH 12/18] try specify fix --- .github/workflows/build_cross.yml | 2 +- conanfile.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_cross.yml b/.github/workflows/build_cross.yml index f4f3dd9ed..c2e8a67c3 100644 --- a/.github/workflows/build_cross.yml +++ b/.github/workflows/build_cross.yml @@ -137,7 +137,7 @@ jobs: -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=./cmake/conan_provider.cmake \ -DCONAN_HOST_PROFILE="host" \ - -DCONAN_INSTALL_ARGS=--build=never \ + -DCONAN_INSTALL_ARGS="--build=never;-c=opentelemetry-cpp/*:tools.build:cxxflags=['-include','cstdint']" \ -DCRASHPAD_NOT_SUPPORTED=true \ -DCMAKE_C_COMPILER_LAUNCHER="${{github.workspace}}/bin/sccache" -DCMAKE_CXX_COMPILER_LAUNCHER="${{github.workspace}}/bin/sccache" \ -DCORRADE_RC_PROGRAM=$(command -v corrade-rc) \ diff --git a/conanfile.py b/conanfile.py index 8be67dc7b..2a01b519a 100644 --- a/conanfile.py +++ b/conanfile.py @@ -20,7 +20,7 @@ def requirements(self): self.requires("libpcap/1.10.5", force=True) else: self.requires("npcap/1.70") - self.requires("opentelemetry-cpp/1.21.0") + self.requires("opentelemetry-cpp/1.17.0") self.requires("pcapplusplus/23.09") self.requires("protobuf/5.27.0") self.requires("sigslot/1.2.2") From 44d8e52a4e84c1ebb1e2099c851cbc94f860fd20 Mon Sep 17 00:00:00 2001 From: Leonardo Parente <23251360+leoparente@users.noreply.github.com> Date: Sat, 6 Sep 2025 18:05:59 -0300 Subject: [PATCH 13/18] fix conan install --- .github/workflows/build_cross.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_cross.yml b/.github/workflows/build_cross.yml index c2e8a67c3..c1372d235 100644 --- a/.github/workflows/build_cross.yml +++ b/.github/workflows/build_cross.yml @@ -125,7 +125,7 @@ jobs: - name: Install dependencies working-directory: ${{github.workspace}}/src run: | - conan install . -pr:b=default -pr:h="host" --build=missing + conan install . -pr:b=default -pr:h="host" --build=missing -c=opentelemetry-cpp/*:tools.build:cxxflags=['-include','cstdint'] - name: Configure working-directory: ${{github.workspace}}/src/build @@ -137,7 +137,7 @@ jobs: -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_PROJECT_TOP_LEVEL_INCLUDES=./cmake/conan_provider.cmake \ -DCONAN_HOST_PROFILE="host" \ - -DCONAN_INSTALL_ARGS="--build=never;-c=opentelemetry-cpp/*:tools.build:cxxflags=['-include','cstdint']" \ + -DCONAN_INSTALL_ARGS=--build=never \ -DCRASHPAD_NOT_SUPPORTED=true \ -DCMAKE_C_COMPILER_LAUNCHER="${{github.workspace}}/bin/sccache" -DCMAKE_CXX_COMPILER_LAUNCHER="${{github.workspace}}/bin/sccache" \ -DCORRADE_RC_PROGRAM=$(command -v corrade-rc) \ From 84e370b758c36220d1e10279a97899c7edb10d40 Mon Sep 17 00:00:00 2001 From: Leonardo Parente <23251360+leoparente@users.noreply.github.com> Date: Sat, 6 Sep 2025 18:26:29 -0300 Subject: [PATCH 14/18] fix flag --- .github/workflows/build-develop.yml | 3 +-- .github/workflows/build_cross.yml | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-develop.yml b/.github/workflows/build-develop.yml index 1c82a4d89..423779d1b 100644 --- a/.github/workflows/build-develop.yml +++ b/.github/workflows/build-develop.yml @@ -47,8 +47,7 @@ jobs: restore-keys: conan-${{ runner.os }}- - name: Detect Conan Profile - run: | - conan profile detect -f + run: conan profile detect -f - name: Configure CMake shell: bash diff --git a/.github/workflows/build_cross.yml b/.github/workflows/build_cross.yml index c1372d235..957200c69 100644 --- a/.github/workflows/build_cross.yml +++ b/.github/workflows/build_cross.yml @@ -125,7 +125,7 @@ jobs: - name: Install dependencies working-directory: ${{github.workspace}}/src run: | - conan install . -pr:b=default -pr:h="host" --build=missing -c=opentelemetry-cpp/*:tools.build:cxxflags=['-include','cstdint'] + conan install . -pr:b=default -pr:h="host" --build=missing -c="opentelemetry-cpp/*:tools.build:cxxflags=['-include','cstdint']" - name: Configure working-directory: ${{github.workspace}}/src/build From 1190956b855f856e2084f3bceff1f7fd2c70b958 Mon Sep 17 00:00:00 2001 From: Leonardo Parente <23251360+leoparente@users.noreply.github.com> Date: Sat, 6 Sep 2025 18:57:16 -0300 Subject: [PATCH 15/18] try to fix build --- .github/workflows/build_cross.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_cross.yml b/.github/workflows/build_cross.yml index 957200c69..c77b267db 100644 --- a/.github/workflows/build_cross.yml +++ b/.github/workflows/build_cross.yml @@ -24,7 +24,6 @@ jobs: toolchain: https://github.com/cross-tools/musl-cross/releases/download/20250815/x86_64-unknown-linux-musl.tar.xz cc: x86_64-unknown-linux-musl-gcc cxx: x86_64-unknown-linux-musl-g++ - ldflags: "-static" # - arch: armv7lh # ARMv7 little-endian hard-float # conan_arch: armv7hf # toolchain: https://github.com/cross-tools/musl-cross/releases/download/20250815/armv7-unknown-linux-musleabihf.tar.xz @@ -35,7 +34,6 @@ jobs: toolchain: https://github.com/cross-tools/musl-cross/releases/download/20250815/aarch64-unknown-linux-musl.tar.xz cc: aarch64-unknown-linux-musl-gcc cxx: aarch64-unknown-linux-musl-g++ - ldflags: "-static" env: CC: gcc CXX: g++ @@ -112,7 +110,6 @@ jobs: [buildenv] CC=${{github.workspace}}/toolchain/bin/${{matrix.cc}} CXX=${{github.workspace}}/toolchain/bin/${{matrix.cxx}} - LDFLAGS=${{matrix.ldflags}} EOF - name: Setup Conan Cache @@ -131,7 +128,6 @@ jobs: working-directory: ${{github.workspace}}/src/build run: | export CC CXX - export LDFLAGS=-static source Release/generators/conanbuild.sh cmake .. \ -DCMAKE_BUILD_TYPE=Release \ @@ -139,6 +135,8 @@ jobs: -DCONAN_HOST_PROFILE="host" \ -DCONAN_INSTALL_ARGS=--build=never \ -DCRASHPAD_NOT_SUPPORTED=true \ + -DBUILD_SHARED_LIBS=OFF \ + -DCMAKE_EXE_LINKER_FLAGS="-static" \ -DCMAKE_C_COMPILER_LAUNCHER="${{github.workspace}}/bin/sccache" -DCMAKE_CXX_COMPILER_LAUNCHER="${{github.workspace}}/bin/sccache" \ -DCORRADE_RC_PROGRAM=$(command -v corrade-rc) \ -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic From fa950719940b0f9873a40c1c231f95d88571d018 Mon Sep 17 00:00:00 2001 From: Leonardo Parente <23251360+leoparente@users.noreply.github.com> Date: Thu, 18 Sep 2025 15:25:43 -0300 Subject: [PATCH 16/18] fix links --- .github/workflows/build_cross.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_cross.yml b/.github/workflows/build_cross.yml index c77b267db..2c4e85f0c 100644 --- a/.github/workflows/build_cross.yml +++ b/.github/workflows/build_cross.yml @@ -21,17 +21,17 @@ jobs: include: - arch: x86_64 conan_arch: x86_64 - toolchain: https://github.com/cross-tools/musl-cross/releases/download/20250815/x86_64-unknown-linux-musl.tar.xz + toolchain: https://github.com/netboxlabs/pktvisor/releases/download/toolchains/x86_64-linux-musl-cross.tgz cc: x86_64-unknown-linux-musl-gcc cxx: x86_64-unknown-linux-musl-g++ # - arch: armv7lh # ARMv7 little-endian hard-float # conan_arch: armv7hf - # toolchain: https://github.com/cross-tools/musl-cross/releases/download/20250815/armv7-unknown-linux-musleabihf.tar.xz + # toolchain: https://github.com/netboxlabs/pktvisor/releases/download/toolchains/armv7l-linux-musleabihf-cross.tgz # cc: armv7l-linux-musleabihf-gcc # cxx: armv7l-linux-musleabihf-g++ - arch: aarch64 conan_arch: armv8 - toolchain: https://github.com/cross-tools/musl-cross/releases/download/20250815/aarch64-unknown-linux-musl.tar.xz + toolchain: https://github.com/netboxlabs/pktvisor/releases/download/toolchains/aarch64-linux-musl-cross.tgz cc: aarch64-unknown-linux-musl-gcc cxx: aarch64-unknown-linux-musl-g++ env: @@ -65,7 +65,7 @@ jobs: if: steps.cache-toolchain.outputs.cache-hit != 'true' run: | mkdir -p toolchain - curl -L "${{matrix.toolchain}}" | tar -C toolchain -xJ --strip-components=1 + curl -L "${{matrix.toolchain}}" | tar -C toolchain -xz --strip-components=1 - name: Install Conan run: pip install --no-cache-dir conan --force-reinstall From 0d6b74f3bdfd591abf773f7d3194d2f428c48427 Mon Sep 17 00:00:00 2001 From: Leonardo Parente <23251360+leoparente@users.noreply.github.com> Date: Thu, 18 Sep 2025 15:28:29 -0300 Subject: [PATCH 17/18] fix binary --- .github/workflows/build_cross.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_cross.yml b/.github/workflows/build_cross.yml index 2c4e85f0c..52c4a239d 100644 --- a/.github/workflows/build_cross.yml +++ b/.github/workflows/build_cross.yml @@ -22,8 +22,8 @@ jobs: - arch: x86_64 conan_arch: x86_64 toolchain: https://github.com/netboxlabs/pktvisor/releases/download/toolchains/x86_64-linux-musl-cross.tgz - cc: x86_64-unknown-linux-musl-gcc - cxx: x86_64-unknown-linux-musl-g++ + cc: x86_64-linux-musl-gcc + cxx: x86_64-linux-musl-g++ # - arch: armv7lh # ARMv7 little-endian hard-float # conan_arch: armv7hf # toolchain: https://github.com/netboxlabs/pktvisor/releases/download/toolchains/armv7l-linux-musleabihf-cross.tgz @@ -32,8 +32,8 @@ jobs: - arch: aarch64 conan_arch: armv8 toolchain: https://github.com/netboxlabs/pktvisor/releases/download/toolchains/aarch64-linux-musl-cross.tgz - cc: aarch64-unknown-linux-musl-gcc - cxx: aarch64-unknown-linux-musl-g++ + cc: aarch64-linux-musl-gcc + cxx: aarch64-linux-musl-g++ env: CC: gcc CXX: g++ From e79a8411b3bd5c3aaffbf9bbed503c25c8746be0 Mon Sep 17 00:00:00 2001 From: Leonardo Parente <23251360+leoparente@users.noreply.github.com> Date: Thu, 18 Sep 2025 16:22:05 -0300 Subject: [PATCH 18/18] reset to previous GHA --- .github/workflows/build_cross.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_cross.yml b/.github/workflows/build_cross.yml index 52c4a239d..b85c8619a 100644 --- a/.github/workflows/build_cross.yml +++ b/.github/workflows/build_cross.yml @@ -24,6 +24,7 @@ jobs: toolchain: https://github.com/netboxlabs/pktvisor/releases/download/toolchains/x86_64-linux-musl-cross.tgz cc: x86_64-linux-musl-gcc cxx: x86_64-linux-musl-g++ + ldflags: "-static" # - arch: armv7lh # ARMv7 little-endian hard-float # conan_arch: armv7hf # toolchain: https://github.com/netboxlabs/pktvisor/releases/download/toolchains/armv7l-linux-musleabihf-cross.tgz @@ -34,6 +35,7 @@ jobs: toolchain: https://github.com/netboxlabs/pktvisor/releases/download/toolchains/aarch64-linux-musl-cross.tgz cc: aarch64-linux-musl-gcc cxx: aarch64-linux-musl-g++ + ldflags: "-static" env: CC: gcc CXX: g++ @@ -110,6 +112,7 @@ jobs: [buildenv] CC=${{github.workspace}}/toolchain/bin/${{matrix.cc}} CXX=${{github.workspace}}/toolchain/bin/${{matrix.cxx}} + LDFLAGS=${{matrix.ldflags}} EOF - name: Setup Conan Cache @@ -122,12 +125,13 @@ jobs: - name: Install dependencies working-directory: ${{github.workspace}}/src run: | - conan install . -pr:b=default -pr:h="host" --build=missing -c="opentelemetry-cpp/*:tools.build:cxxflags=['-include','cstdint']" + conan install . -pr:b=default -pr:h="host" --build=missing - name: Configure working-directory: ${{github.workspace}}/src/build run: | export CC CXX + export LDFLAGS=-static source Release/generators/conanbuild.sh cmake .. \ -DCMAKE_BUILD_TYPE=Release \ @@ -135,8 +139,6 @@ jobs: -DCONAN_HOST_PROFILE="host" \ -DCONAN_INSTALL_ARGS=--build=never \ -DCRASHPAD_NOT_SUPPORTED=true \ - -DBUILD_SHARED_LIBS=OFF \ - -DCMAKE_EXE_LINKER_FLAGS="-static" \ -DCMAKE_C_COMPILER_LAUNCHER="${{github.workspace}}/bin/sccache" -DCMAKE_CXX_COMPILER_LAUNCHER="${{github.workspace}}/bin/sccache" \ -DCORRADE_RC_PROGRAM=$(command -v corrade-rc) \ -DCMAKE_CXX_STANDARD_LIBRARIES=-latomic