Merge branch 'make-proto-conversions-private' of ssh://github.com/stuqdog/cpp-sdk into make-proto-conversions-private

Author: stuqdog

.github/workflows/conan.yml

@@ -1,10 +1,16 @@
 name: Test conan packages
 
 on:
-  # Run weekdays at 11:15pm UTC, and specify below to only run if there's been new commits
+  # Runs for PRs that directly change conan code, and weekdays at 11:15pm UTC.
+  # Additional logic in the prepare job below makes it so scheduled builds only run
+  # on new commits.
   schedule:
     - cron: "15 11 * * 1-5"
   workflow_dispatch:
+  pull_request:
+    paths:
+      - conanfile.py
+      - test_package/conanfile.py
 
 jobs:
   prepare:
@@ -13,17 +19,25 @@ jobs:
     steps:
       - name: Checkout Code
         uses: actions/checkout@v4
-
-      - name: Get new commit count
-        id: new_commit_count
-        shell: bash
-        run: echo "commit_count=$(git log --oneline --since '24 hours ago' | wc -l)" >> $GITHUB_OUTPUT
-
-      - name: Cancelling scheduled build with no new commits
+      - name: Get current git info
+        if: github.event_name == 'schedule'
+        id: git_info
+        run: |
+          echo "current_commit=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+          echo "current_branch=$(git branch --show-current)" >> $GITHUB_OUTPUT
+      - name: Get last successful commit
+        if: github.event_name == 'schedule'
+        id: last_successful_commit
+        uses: tylermilner/last-successful-commit-hash-action@v1
+        with:
+          branch: main
+          workflow-id: conan.yml
+          github-token: ${{ github.token }}
+      - name: Cancel scheduled build with no new commits
         uses: andymckay/[email protected]
         if: |
-          steps.new_commit_count.outputs.commit_count == '0' &&
-          github.event_name == 'schedule'
+          github.event_name == 'schedule' &&
+          steps.git_info.outputs.current_commit == steps.last_successful_commit.outputs.commit-hash
 
   build_macos:
     if: github.repository_owner == 'viamrobotics'

.github/workflows/docker.yml

@@ -0,0 +1,61 @@
+on:
+  workflow_dispatch:
+    inputs:
+      image-prefix:
+        description: "gets suffixed with 'base' and 'sdk' to create actual image name"
+        default: ghcr.io/viamrobotics/cpp-
+      dockerfile:
+        default: Dockerfile.debian.bullseye
+      tag:
+        default: bullseye-amd64
+      build-base:
+        description: "whether to build the base image. the base images change less often and may not be necessary to rebuild."
+        type: boolean
+        default: false
+      build-sdk:
+        description: "whether to build the SDK image. if this is true and no corresponding base image exists, the job will fail."
+        type: boolean
+        default: false
+      push:
+        description: "whether to push the images after building them"
+        type: boolean
+        default: false
+
+jobs:
+  build-container:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+    - uses: actions/checkout@v4
+
+    # build base (if inputs.build-base)
+    - uses: docker/metadata-action@v5
+      id: base-meta
+      if: inputs.build-base
+      with:
+        images: ${{ inputs.image-prefix }}base
+    - uses: docker/build-push-action@v5
+      if: inputs.build-base
+      with:
+        push: ${{ inputs.push }}
+        tags: "${{ inputs.image-prefix }}base:${{ inputs.tag }}"
+        file: etc/docker/base-images/${{ inputs.dockerfile }}
+        labels: ${{ steps.base-meta.output.labels }}
+
+    # build sdk (if inputs.build-sdk)
+    - uses: docker/metadata-action@v5
+      id: sdk-meta
+      if: inputs.build-sdk
+      with:
+        images: ${{ inputs.image-prefix }}sdk
+    - uses: docker/build-push-action@v5
+      if: inputs.build-sdk
+      with:
+        build-args: |
+          BASE_TAG=${{ inputs.image-prefix }}base:${{ inputs.tag }}
+        push: ${{ inputs.push }}
+        tags: "${{ inputs.image-prefix }}sdk:${{ inputs.tag }}"
+        file: etc/docker/Dockerfile.sdk-build
+        labels: ${{ steps.sdk-meta.output.labels }}

CMakeLists.txt

@@ -34,7 +34,7 @@
 # constrained by the version of CMake available on target systems.
 cmake_minimum_required(VERSION 3.25 FATAL_ERROR)
 
-set(CMAKE_PROJECT_VERSION 0.0.14)
+set(CMAKE_PROJECT_VERSION 0.0.15)
 
 # Identify the project.
 project(viam-cpp-sdk

conanfile.py

@@ -32,14 +32,15 @@ def set_version(self):
         self.version = re.search("set\(CMAKE_PROJECT_VERSION (.+)\)", content).group(1).strip()
 
     def configure(self):
-        # If we're building static then build the world as static, otherwise
-        # stuff will probably break.
-        # If you want your shared build to also build the world as shared, you
-        # can invoke conan with -o "&:shared=False" -o "*:shared=False",
-        # possibly with --build=missing or --build=cascade as desired,
-        # but this is probably not necessary.
-        if not self.options.shared:
-            self.options["*"].shared = False
+        if self.options.shared:
+            # See https://github.com/conan-io/conan-center-index/issues/25107
+            self.options["grpc"].secure = True
+
+            # 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"]:
+                self.options[lib].shared = True
 
     def requirements(self):
         self.requires('boost/[>=1.74.0]', transitive_headers=True)
@@ -49,8 +50,8 @@ def requirements(self):
         self.requires('grpc/[>=1.48.4]', transitive_headers=True)
         self.requires('protobuf/[>=3.17.1]', transitive_headers=True)
 
-        self.requires('xtensor/[>=0.24.3]', transitive_headers=True)
-        self.requires('abseil/[>=20230125.3]')
+        self.requires('xtensor/[>=0.24.3]')
+        self.requires('abseil/[>=20230125.3]', transitive_libs=True)
 
     def build_requirements(self):
         if self.options.offline_proto_generation:
@@ -83,13 +84,13 @@ def package(self):
 
     def package_info(self):
         self.cpp_info.components["viam_rust_utils"].libs = ["viam_rust_utils"]
-        
+
         self.cpp_info.components["viamsdk"].libs = ["viamsdk"]
 
         for component in ["viamsdk", "viamapi"]:
            self.cpp_info.components[component].set_property("cmake_target_name", "viam-cpp-sdk::{}".format(component))
            self.cpp_info.components[component].set_property("pkg_config_name", "viam-cpp-sdk-lib{}".format(component))
-           self.cpp_info.components[component].requires = ["grpc::grpc++", "protobuf::libprotobuf"]
+           self.cpp_info.components[component].requires = ["grpc::grpc++"]
            if self.settings.os in ["Linux", "FreeBSD"]:
             self.cpp_info.components[component].system_libs = ["pthread"]
 
@@ -114,11 +115,12 @@ def package_info(self):
             "viamapi",
             "boost::headers",
             "boost::log",
+            "grpc::grpc++_reflection",
+            "protobuf::libprotobuf",
             "xtensor::xtensor",
 
             "viam_rust_utils",
             "abseil::absl_strings",
-            "grpc::grpc++_reflection"
         ])
 
         self.cpp_info.components["viamsdk"].frameworks = ["Security"]

src/viam/api/api_proto_tag.lock

@@ -1 +1 @@
-v0.1.354
+v0.1.362