Skip to content

Commit d83cb28

Browse files
authored
Merge branch 'main' into workflow/ai-updater
2 parents ffcd084 + 1ed59df commit d83cb28

21 files changed

+6445
-234
lines changed

.github/workflows/conan.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,10 @@ jobs:
5858

5959
- name: Install dependencies
6060
run: |
61-
brew install cmake
62-
brew install python ninja buf
61+
cmake --version
62+
python --version
63+
ninja --version
64+
brew install buf
6365
python -m pip install conan
6466
6567
- name: Create package
@@ -192,7 +194,7 @@ jobs:
192194
run: |
193195
apt-get install -y software-properties-common
194196
apt-add-repository -y 'deb https://archive.debian.org/debian bullseye-backports main'
195-
197+
196198
apt-get update
197199
apt-get -y install cmake
198200

.github/workflows/release.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,10 @@ jobs:
103103

104104
- name: Install dependencies
105105
run: |
106-
brew install cmake boost grpc protobuf xtensor
107-
brew install pkg-config ninja buf
106+
cmake --version
107+
ninja --version
108+
brew install boost grpc protobuf xtensor
109+
brew install pkg-config buf
108110
109111
- name: Setup build directory
110112
run: mkdir builds

BUILDING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ that they are pre-populated.
441441
cmake -DVIAMCPPSDK_USE_DYNAMIC_PROTOS=ON ...
442442
ninja all # FAILS!
443443
ninja generate-dynamic-protos
444-
nina all # OK!
444+
ninja all # OK!
445445
```
446446

447447
### Build Issue: Proto Mismatch

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ else()
4141
cmake_minimum_required(VERSION 3.25 FATAL_ERROR)
4242
endif()
4343

44-
set(CMAKE_PROJECT_VERSION 0.18.0)
44+
set(CMAKE_PROJECT_VERSION 0.19.0)
4545

4646
# Identify the project.
4747
project(viam-cpp-sdk

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.473
1+
v0.1.475

src/viam/api/buf.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ deps:
88
- remote: buf.build
99
owner: viamrobotics
1010
repository: api
11-
commit: 010ac1d3b4094fc2bd070f7b09d74e4f
11+
commit: 62132a8359d946918eb4169b339a0f3a
1212
- remote: buf.build
1313
owner: viamrobotics
1414
repository: goutils

src/viam/api/common/v1/common.pb.cc

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

0 commit comments

Comments
 (0)