Skip to content

Commit 15abea3

Browse files
committed
cleanup release a bit, print more info
1 parent 1dd810f commit 15abea3

File tree

3 files changed

+32
-27
lines changed

3 files changed

+32
-27
lines changed

.github/workflows/conan.yml

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -67,27 +67,19 @@ jobs:
6767
- name: Install Scoop
6868
uses: MinoruSekine/[email protected]
6969

70-
- name: install buf 'n stuff # the official way to install somehow lol
70+
- name: install buf 'n stuff
7171
run: scoop install buf ninja
7272

73-
- name: Install conan
73+
- name: Install dependencies
7474
uses: crazy-max/ghaction-chocolatey@v3
7575
with:
76-
args: install -y conan git 7zip jq #cmake
76+
args: install -y conan git 7zip jq
7777

7878
# Ensures that things installed with choco are visible to us
7979
- name: refresh env
8080
run: |
8181
Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1
8282
refreshenv
83-
#- name: install conan
84-
#run: py -m pip install conan
85-
86-
#- name: Install dependencies
87-
#run: |
88-
#chocolatey install
89-
##brew install python ninja
90-
#py -m pip install conan
9183
9284
- name: Create package
9385
shell: powershell

.github/workflows/release.yml

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ jobs:
5353
with:
5454
ref: ${{ needs.prepare.outputs.sha }}
5555

56-
#- name: Install cmake
57-
#uses: ssrobins/install-cmake@v1
58-
#with:
59-
#version: 3.27.2
56+
- name: Install cmake
57+
uses: ssrobins/install-cmake@v1
58+
with:
59+
version: 3.27.2
6060

6161
- name: Install python
6262
uses: actions/setup-python@v5
@@ -66,37 +66,42 @@ jobs:
6666
- name: Install Scoop
6767
uses: MinoruSekine/[email protected]
6868

69-
- name: install buf 'n stuff # the official way to install somehow lol
69+
- name: install buf 'n stuff
7070
run: scoop install buf ninja
7171

72-
#- name: install conan
73-
#run: py -m pip install conan
7472
- name: Install dependencies
7573
uses: crazy-max/ghaction-chocolatey@v3
7674
with:
77-
args: install -y conan cmake
75+
args: install -y conan git 7zip jq
76+
7877

7978
# Ensures that things installed with choco are visible to us
8079
- name: refresh env
8180
run: |
8281
Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1
8382
refreshenv
84-
#- name: Setup build directory
85-
#run: mkdir builds
86-
87-
#- name: list stuff
88-
#run: ls ./boost/boost/libs
89-
#run: ls ${{ steps.install-boost.outuputs.BOOST_ROOT }}
9083
9184
- name: Create package
9285
shell: powershell
9386
run: |
87+
Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1
88+
refreshenv
9489
conan profile detect
95-
conan create . --build=missing -s compiler.cppstd=17
90+
conan create . `
91+
--build=missing `
92+
-o "&:shared=False" `
93+
-s:h compiler.cppstd=17 `
94+
-c:h tools.microsoft:winsdk_version=10.0.17763.0 `
95+
-s:h compiler.runtime=static
9696
env:
9797
CONAN_USER_HOME: c:/cache
9898
CONAN_USER_HOME_SHORT: c:/cache/conan_shortpaths
9999

100+
- name: list stuff
101+
run: |
102+
ls
103+
ls build/
104+
100105
#- name: Build
101106
#run: |
102107
#mkdir build

CMakeLists.txt

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,13 @@ find_package(Threads REQUIRED)
258258
set(viam_rust_utils_file ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}viam_rust_utils${CMAKE_STATIC_LIBRARY_SUFFIX})
259259

260260
file(GLOB viam_rust_utils_files ${PROJECT_SOURCE_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}viam_rust_utils*${CMAKE_STATIC_LIBRARY_SUFFIX})
261+
if (NOT WIN32)
262+
message(WARNING "we are not WIN32")
263+
endif()
264+
265+
if (CMAKE_SYSTEM_PROCESSOR STREQUAL "X86" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "X64")
266+
message(WARNING "We are x86 or x64")
267+
endif()
261268

262269
if (viam_rust_utils_files)
263270
list(LENGTH viam_rust_utils_files num_viam_rust_utils_files)
@@ -292,7 +299,8 @@ elseif(NOT WIN32 OR (CMAKE_SYSTEM_PROCESSOR STREQUAL "X86") OR (CMAKE_SYSTEM_PRO
292299
if(NOT lvru_status_code EQUAL 0)
293300
message(FATAL_ERROR "No local viam_rust_utils found and failed to download: ${lvru_status_string}")
294301
endif()
295-
302+
else()
303+
message(WARNING "We aren't trying to get rust-utils for some reason. Win32? ${WIN32}. system processor? ${CMAKE_SYSTEM_PROCESSOR}")
296304
endif()
297305

298306
# TODO(RSDK-10366): Currently, rust_utils is not published for windows, so don't even declare the library

0 commit comments

Comments
 (0)