Skip to content

Commit 94a1d7a

Browse files
authored
Merge branch 'main' into workflow/update-protos
2 parents 5cb6ee2 + 352512e commit 94a1d7a

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

.github/workflows/conan-publish.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
run: |
4242
conan profile detect
4343
conan remote add viamconan $CONAN_REMOTE_URL
44-
conan remote auth -cc core:non_interactive=True viamconan
44+
conan remote auth --force -cc core:non_interactive=True viamconan
4545
4646
- name: Create and upload package
4747
run: |
@@ -133,7 +133,7 @@ jobs:
133133
134134
conan profile detect
135135
conan remote add viamconan $CONAN_REMOTE_URL
136-
conan remote auth -cc core:non_interactive=True viamconan
136+
conan remote auth --force -cc core:non_interactive=True viamconan
137137
138138
- name: Create and upload package
139139
run: |
@@ -145,6 +145,8 @@ jobs:
145145
- name: Upload additional deps
146146
if: inputs.upload_deps && !(matrix.runner == 'buildjet-8vcpu-ubuntu-2204' && matrix.image == 'ubuntu:22.04')
147147
run: |
148+
. ./conan_venv/bin/activate
149+
148150
conan upload "boost/*" -r viamconan -c
149151
conan upload "grpc/*" -r viamconan -c
150152
conan upload "protobuf/*" -r viamconan -c
@@ -171,7 +173,7 @@ jobs:
171173
conan profile detect
172174
173175
conan remote add viamconan $env:CONAN_REMOTE_URL
174-
conan remote auth -cc core:non_interactive=True viamconan
176+
conan remote auth --force -cc core:non_interactive=True viamconan
175177
env:
176178
CONAN_REMOTE_URL: ${{ secrets.conanRemote }}
177179
CONAN_LOGIN_USERNAME_VIAMCONAN: ${{ secrets.conanUsername}}

BUILDING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,8 @@ If the build did not succeed, please see the next section.
143143

144144
## Building with `conan`
145145

146-
As of version 0.0.11 there is experimental support for building with
147-
the `conan` C++ package manager. This section will go into more detail
146+
The Viam C++ SDK provides first class support for the `conan` C++
147+
package manager. This section will go into more detail
148148
without assuming any familiarity with `conan`, but please consult the
149149
[`conan` docs](https://docs.conan.io/2/introduction.html) for more info.
150150

0 commit comments

Comments
 (0)