Skip to content

Commit 4c3b0e6

Browse files
committed
Merge branch 'main' of github.com:viamrobotics/viam-cpp-sdk into fix/conan
2 parents 29166ac + e969bfc commit 4c3b0e6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+22026
-15100
lines changed

.github/workflows/update_protos.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ jobs:
1414
image: ghcr.io/viamrobotics/canon:amd64
1515
steps:
1616
- uses: actions/checkout@v4
17+
with:
18+
token: ${{ secrets.GIT_ACCESS_TOKEN }}
1719
# note (erodkin): these dependencies were cribbed from what we use to build the SDK
1820
# in the release job. Only very cursory effort was made to prune.
1921
- name: install dependencies
@@ -75,6 +77,7 @@ jobs:
7577
body: This is an auto-generated PR to update proto definitions. Check the commits to see which repos and commits are responsible for the changes
7678
assignees: stuqdog
7779
reviewers: stuqdog
80+
token: ${{ secrets.GIT_ACCESS_TOKEN }}
7881

7982
- name: Notify slack of failure
8083
uses: slackapi/[email protected]

CMakeLists.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
# constrained by the version of CMake available on target systems.
3535
cmake_minimum_required(VERSION 3.25 FATAL_ERROR)
3636

37-
set(CMAKE_PROJECT_VERSION 0.3.0)
37+
set(CMAKE_PROJECT_VERSION 0.4.0)
3838

3939
# Identify the project.
4040
project(viam-cpp-sdk
@@ -324,7 +324,11 @@ set(VIAMCPPSDK_XTL_VERSION_MINIMUM 0.7.2)
324324
set(VIAMCPPSDK_XTENSOR_VERSION_MINIMUM 0.24.3)
325325

326326
# Time to find `BOOST`.
327-
find_package(Boost ${VIAMCPPSDK_BOOST_VERSION_MINIMUM} REQUIRED COMPONENTS headers log program_options)
327+
if (VIAMCPPSDK_BUILD_TESTS)
328+
set(VIAMCPPSDK_BOOST_TEST "unit_test_framework")
329+
endif()
330+
331+
find_package(Boost ${VIAMCPPSDK_BOOST_VERSION_MINIMUM} REQUIRED COMPONENTS headers log program_options ${VIAMCPPSDK_BOOST_TEST})
328332

329333
# Time to find `protobuf` and `gRPC[++]`. Normally this would just be
330334
# something like `find_package(gRPC <version> CONFIG REQUIRED)`, and

src/viam/api/api_proto_tag.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v0.1.400
1+
v0.1.413

src/viam/api/app/mltraining/v1/ml_training.pb.cc

Lines changed: 193 additions & 149 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/viam/api/app/mltraining/v1/ml_training.pb.h

Lines changed: 31 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)