From 841bc85c5a951b9dae7c26fea01be73550183bc7 Mon Sep 17 00:00:00 2001 From: Lia Stratopoulos <167905060+lia-viam@users.noreply.github.com> Date: Mon, 10 Mar 2025 11:01:41 -0400 Subject: [PATCH 01/10] remove mention of abseil from conanfile --- conanfile.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/conanfile.py b/conanfile.py index 6a03efe24..b1c98ecea 100644 --- a/conanfile.py +++ b/conanfile.py @@ -39,7 +39,7 @@ def configure(self): # From some experiments it seems that the shared-ness of these packages # should match that of the SDK recipe. Failure to do so can cause linker # errors while compiling, or static initialization errors at runtime for modules. - for lib in ["grpc", "protobuf", "abseil"]: + for lib in ["grpc", "protobuf"]: self.options[lib].shared = True def requirements(self): @@ -51,7 +51,6 @@ def requirements(self): self.requires('protobuf/[>=3.17.1]') self.requires('xtensor/[>=0.24.3]') - self.requires('abseil/[>=20230125.3]') def build_requirements(self): if self.options.offline_proto_generation: @@ -94,8 +93,6 @@ def package_info(self): if self.settings.os in ["Linux", "FreeBSD"]: self.cpp_info.components[component].system_libs = ["pthread"] - self.cpp_info.components["viamapi"].requires.append("abseil::absl_strings") - if self.settings.os in ["Linux", "FreeBSD"]: self.cpp_info.components["viamsdk"].system_libs.extend(["dl", "rt"]) From 30e92e50216012f90e4ab47fed1a48c911622dae Mon Sep 17 00:00:00 2001 From: Lia Stratopoulos <167905060+lia-viam@users.noreply.github.com> Date: Mon, 24 Mar 2025 11:27:22 -0400 Subject: [PATCH 02/10] add fix lines for debian and jammy --- .github/workflows/conan.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/conan.yml b/.github/workflows/conan.yml index fe8933018..ee690df83 100644 --- a/.github/workflows/conan.yml +++ b/.github/workflows/conan.yml @@ -128,7 +128,7 @@ jobs: shell: bash run: | conan profile detect - conan create . --build=missing -s compiler.cppstd=14 + conan create . --build=missing -s compiler.cppstd=14 -a:s compiler.cppstd=14 -o "abseil/*:shared=True" build_linux_debian: if: github.repository_owner == 'viamrobotics' @@ -204,4 +204,4 @@ jobs: pip install conan conan profile detect - conan create . --build=missing -s compiler.cppstd=14 + conan create . --build=missing -s compiler.cppstd=14 -a:s compiler.cppstd=14 -o "abseil/*:shared=True" From 7331ac5505e2e6bd32bb770ce8597e319b521b2a Mon Sep 17 00:00:00 2001 From: Lia Stratopoulos <167905060+lia-viam@users.noreply.github.com> Date: Mon, 24 Mar 2025 11:29:23 -0400 Subject: [PATCH 03/10] workflow should trigger itself --- .github/workflows/conan.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/conan.yml b/.github/workflows/conan.yml index ee690df83..a9347463b 100644 --- a/.github/workflows/conan.yml +++ b/.github/workflows/conan.yml @@ -11,6 +11,7 @@ on: paths: - conanfile.py - test_package/conanfile.py + - .github/workflows/conan.yml jobs: prepare: From 6179dddc7cdcdf34706efba820583c3fda8962d6 Mon Sep 17 00:00:00 2001 From: Lia Stratopoulos <167905060+lia-viam@users.noreply.github.com> Date: Mon, 24 Mar 2025 13:24:55 -0400 Subject: [PATCH 04/10] typo fix --- .github/workflows/conan.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/conan.yml b/.github/workflows/conan.yml index a9347463b..9251d3064 100644 --- a/.github/workflows/conan.yml +++ b/.github/workflows/conan.yml @@ -129,7 +129,7 @@ jobs: shell: bash run: | conan profile detect - conan create . --build=missing -s compiler.cppstd=14 -a:s compiler.cppstd=14 -o "abseil/*:shared=True" + conan create . --build=missing -s compiler.cppstd=14 -s:a compiler.cppstd=14 -o "abseil/*:shared=True" build_linux_debian: if: github.repository_owner == 'viamrobotics' @@ -205,4 +205,4 @@ jobs: pip install conan conan profile detect - conan create . --build=missing -s compiler.cppstd=14 -a:s compiler.cppstd=14 -o "abseil/*:shared=True" + conan create . --build=missing -s compiler.cppstd=14 -s:a compiler.cppstd=14 -o "abseil/*:shared=True" From e4fde3bc1d9253003e273cf0545787fd9d3ab32d Mon Sep 17 00:00:00 2001 From: Lia Stratopoulos <167905060+lia-viam@users.noreply.github.com> Date: Mon, 24 Mar 2025 14:28:22 -0400 Subject: [PATCH 05/10] add autoconf --- .github/workflows/conan.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/conan.yml b/.github/workflows/conan.yml index 9251d3064..de98cbd13 100644 --- a/.github/workflows/conan.yml +++ b/.github/workflows/conan.yml @@ -101,6 +101,7 @@ jobs: apt-get update apt-get -y dist-upgrade DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \ + autoconf \ build-essential \ ca-certificates \ curl \ @@ -167,6 +168,7 @@ jobs: apt-get update apt-get -y dist-upgrade DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \ + autoconf \ build-essential \ ca-certificates \ cmake \ From 603c1481807abb9722530b4b6a0afeaa6d6daa89 Mon Sep 17 00:00:00 2001 From: Lia Stratopoulos <167905060+lia-viam@users.noreply.github.com> Date: Mon, 24 Mar 2025 14:42:33 -0400 Subject: [PATCH 06/10] just do all shared --- .github/workflows/conan.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/conan.yml b/.github/workflows/conan.yml index de98cbd13..c6decb7ba 100644 --- a/.github/workflows/conan.yml +++ b/.github/workflows/conan.yml @@ -130,7 +130,7 @@ jobs: shell: bash run: | conan profile detect - conan create . --build=missing -s compiler.cppstd=14 -s:a compiler.cppstd=14 -o "abseil/*:shared=True" + conan create . --build=missing -s compiler.cppstd=14 -s:a compiler.cppstd=14 -o "*:shared=True" build_linux_debian: if: github.repository_owner == 'viamrobotics' @@ -207,4 +207,4 @@ jobs: pip install conan conan profile detect - conan create . --build=missing -s compiler.cppstd=14 -s:a compiler.cppstd=14 -o "abseil/*:shared=True" + conan create . --build=missing -s compiler.cppstd=14 -s:a compiler.cppstd=14 -o "*:shared=True" From b3f78d84f6850726bc3cab5cb390553a8bdbf7b2 Mon Sep 17 00:00:00 2001 From: Lia Stratopoulos <167905060+lia-viam@users.noreply.github.com> Date: Tue, 1 Apr 2025 10:49:34 -0400 Subject: [PATCH 07/10] pin cmake for conan jammy --- .github/workflows/conan.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conan.yml b/.github/workflows/conan.yml index fe8933018..8e11b7112 100644 --- a/.github/workflows/conan.yml +++ b/.github/workflows/conan.yml @@ -120,7 +120,7 @@ jobs: sudo echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ jammy main' | sudo tee /etc/apt/sources.list.d/kitware.list >/dev/null apt-get update - apt-get -y install cmake + apt-get -y install cmake=3.25.2-0kitware1ubuntu22.04.1 cmake-data=3.25.2-0kitware1ubuntu22.04.1 pip install conan From 6ee4a1ee2e3981b600eee7ee4c4a05024b2cc670 Mon Sep 17 00:00:00 2001 From: Lia Stratopoulos <167905060+lia-viam@users.noreply.github.com> Date: Mon, 24 Mar 2025 11:29:23 -0400 Subject: [PATCH 08/10] workflow should trigger itself --- .github/workflows/conan.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/conan.yml b/.github/workflows/conan.yml index 8e11b7112..3e5fafcc0 100644 --- a/.github/workflows/conan.yml +++ b/.github/workflows/conan.yml @@ -11,6 +11,7 @@ on: paths: - conanfile.py - test_package/conanfile.py + - .github/workflows/conan.yml jobs: prepare: From 68f709dba38c110bc1be2c8df905a82b421d1985 Mon Sep 17 00:00:00 2001 From: lia <167905060+lia-viam@users.noreply.github.com> Date: Tue, 8 Apr 2025 13:24:13 -0400 Subject: [PATCH 09/10] Update conan.yml --- .github/workflows/conan.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/conan.yml b/.github/workflows/conan.yml index f8c84f274..227f03cfa 100644 --- a/.github/workflows/conan.yml +++ b/.github/workflows/conan.yml @@ -102,6 +102,7 @@ jobs: apt-get -y dist-upgrade DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install \ autoconf \ + automake \ build-essential \ ca-certificates \ curl \ From 36c32d43068cbdbef82a71db539ae1798cb08426 Mon Sep 17 00:00:00 2001 From: Lia Stratopoulos <167905060+lia-viam@users.noreply.github.com> Date: Tue, 8 Apr 2025 14:14:27 -0400 Subject: [PATCH 10/10] retry conanfile fix --- .github/workflows/conan.yml | 4 ++-- conanfile.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/conan.yml b/.github/workflows/conan.yml index 227f03cfa..15c600ab2 100644 --- a/.github/workflows/conan.yml +++ b/.github/workflows/conan.yml @@ -131,7 +131,7 @@ jobs: shell: bash run: | conan profile detect - conan create . --build=missing -s compiler.cppstd=14 -s:a compiler.cppstd=14 -o "*:shared=True" + conan create . --build=missing -s compiler.cppstd=14 -s:a compiler.cppstd=14 build_linux_debian: if: github.repository_owner == 'viamrobotics' @@ -208,4 +208,4 @@ jobs: pip install conan conan profile detect - conan create . --build=missing -s compiler.cppstd=14 -s:a compiler.cppstd=14 -o "*:shared=True" + conan create . --build=missing -s compiler.cppstd=14 -s:a compiler.cppstd=14 diff --git a/conanfile.py b/conanfile.py index f3e2fa923..a75db1215 100644 --- a/conanfile.py +++ b/conanfile.py @@ -39,7 +39,7 @@ def configure(self): # From some experiments it seems that the shared-ness of these packages # should match that of the SDK recipe. Failure to do so can cause linker # errors while compiling, or static initialization errors at runtime for modules. - for lib in ["grpc", "protobuf"]: + for lib in ["grpc", "protobuf", "abseil"]: self.options[lib].shared = True def requirements(self):