Skip to content

Commit 2779b50

Browse files
committed
Merge branch 'main' of ssh://github.com/viamrobotics/viam-cpp-sdk into RSDK-10366-rust-utils-for-windows
2 parents 9de2913 + dd3ed80 commit 2779b50

File tree

8 files changed

+1446
-1347
lines changed

8 files changed

+1446
-1347
lines changed

.github/workflows/conan.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -249,12 +249,7 @@ jobs:
249249
pip install conan
250250
conan profile detect
251251
252-
mkdir b2-tmp
253-
echo '[requires]
254-
b2/5.3.2
255-
' > b2-tmp/conanfile.txt
256-
cat b2-tmp/conanfile.txt
257-
conan install b2-tmp --build=b2/5.3.2 -s compiler.cppstd=14 -s:a compiler.cppstd=14
258-
rm -r b2-tmp
252+
conan install -r conancenter --update \
253+
--tool-requires=b2/5.3.1 --build=b2/5.3.1 -s compiler.cppstd=14 -s:a compiler.cppstd=14
259254
260255
conan create . --build=missing -s compiler.cppstd=14 -s:a compiler.cppstd=14

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.432
1+
v0.1.434

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

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

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

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

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: 1f5b8a47f15e49af89174672bb898b77
11+
commit: c75370d974ef4b8d85b0be21b54cecb1
1212
- remote: buf.build
1313
owner: viamrobotics
1414
repository: goutils

src/viam/api/module/v1/module.grpc.pb.h

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

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

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

0 commit comments

Comments
 (0)