Skip to content

Commit 230b29d

Browse files
committed
cr comments, test direct choco invocation
1 parent 9459e17 commit 230b29d

File tree

3 files changed

+33
-1
lines changed

3 files changed

+33
-1
lines changed

.github/workflows/conan.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,37 @@ jobs:
4141
steps.git_info.outputs.current_commit == steps.last_successful_commit.outputs.commit-hash
4242
4343
# TODO (RSDK-10666) add windows build testing
44+
build_windows:
45+
if: github.repository_owner == 'viamrobotics'
46+
needs: [prepare]
47+
runs-on: windows-latest
48+
strategy:
49+
fail-fast: false
50+
matrix:
51+
include:
52+
- target: x86_64-windows
53+
platform: windows_x86_64
54+
steps:
55+
- name: Checkout Code
56+
uses: actions/checkout@v4
57+
with:
58+
ref: ${{ needs.prepare.outputs.sha }}
59+
60+
- name: Install dependencies
61+
run: choco install -y conan git
62+
63+
- name: Create package
64+
shell: powershell
65+
run: |
66+
Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1
67+
refreshenv
68+
conan profile detect
69+
conan install . --output-folder=build-conan --build=missing -o "&:shared=False"
70+
cmake . --preset conan-default
71+
cmake --build --preset=conan-release --target ALL_BUILD install -j 8
72+
env:
73+
CONAN_USER_HOME: c:/cache
74+
CONAN_USER_HOME_SHORT: c:/cache/conan_shortpaths
4475

4576
build_macos:
4677
if: github.repository_owner == 'viamrobotics'

.github/workflows/release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ jobs:
5959

6060
- name: Create package
6161
shell: powershell
62+
# TODO (RSDK-10666) Use conan invocations rather than cmake invocations here
6263
run: |
6364
Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1
6465
refreshenv

src/viam/sdk/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ target_link_libraries(viamsdk
279279
# rust-utils doesn't build in CI on windows other than x86_64, so confirm that we're either not
280280
# windows, or if we are windows that we're AMD64, or else that the user has provided their own
281281
# build of rust_utils.
282-
if (NOT WIN32 OR num_viam_rust_utils_files GREATER 0 OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "AMD64")
282+
if (TARGET viam_rust_utils)
283283
target_link_libraries(viamsdk
284284
PRIVATE viam_rust_utils
285285
)

0 commit comments

Comments
 (0)