Skip to content

Commit de30df1

Browse files
stuqdogstuqdog
committed
fixups from windows testing
1 parent b4c4b84 commit de30df1

File tree

10 files changed

+173
-180
lines changed

10 files changed

+173
-180
lines changed

‎.github/workflows/conan.yml‎

Lines changed: 50 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -40,62 +40,63 @@ jobs:
4040
github.event_name == 'schedule' &&
4141
steps.git_info.outputs.current_commit == steps.last_successful_commit.outputs.commit-hash
4242
43-
build_windows:
44-
if: github.repository_owner == 'viamrobotics'
45-
needs: [prepare]
46-
runs-on: windows-latest
47-
strategy:
48-
fail-fast: false
49-
matrix:
50-
include:
51-
- target: x86_64-windows
52-
platform: windows_x86_64
53-
steps:
54-
- name: Checkout Code
55-
uses: actions/checkout@v4
43+
# TODO(RSDK-10638) - uncomment and make all this work once we have good rust-utils windows builds
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
5657

57-
- name: Install cmake
58-
uses: ssrobins/install-cmake@v1
59-
with:
60-
version: 3.27.2
58+
#- name: Install cmake
59+
#uses: ssrobins/install-cmake@v1
60+
#with:
61+
#version: 3.27.2
6162

62-
- name: Install python
63-
uses: actions/setup-python@v5
64-
with:
65-
python-version: '3.12'
63+
#- name: Install python
64+
#uses: actions/setup-python@v5
65+
#with:
66+
#python-version: '3.12'
6667

67-
- name: Install Scoop
68-
uses: MinoruSekine/[email protected]
68+
#- name: Install Scoop
69+
#uses: MinoruSekine/[email protected]
6970

70-
- name: install buf 'n stuff
71-
run: scoop install buf ninja
71+
#- name: install buf 'n stuff
72+
#run: scoop install buf ninja
7273

73-
- name: Install dependencies
74-
uses: crazy-max/ghaction-chocolatey@v3
75-
with:
76-
args: install -y conan git 7zip jq
74+
#- name: Install dependencies
75+
#uses: crazy-max/ghaction-chocolatey@v3
76+
#with:
77+
#args: install -y conan git 7zip jq
7778

78-
# Ensures that things installed with choco are visible to us
79-
- name: refresh env
80-
run: |
81-
Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1
82-
refreshenv
79+
## Ensures that things installed with choco are visible to us
80+
#- name: refresh env
81+
#run: |
82+
#Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1
83+
#refreshenv
8384

84-
- name: Create package
85-
shell: powershell
86-
run: |
87-
Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1
88-
refreshenv
89-
conan profile detect
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
96-
env:
97-
CONAN_USER_HOME: c:/cache
98-
CONAN_USER_HOME_SHORT: c:/cache/conan_shortpaths
85+
#- name: Create package
86+
#shell: powershell
87+
#run: |
88+
#Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1
89+
#refreshenv
90+
#conan profile detect
91+
#conan create . `
92+
#--build=missing `
93+
#-o "&:shared=False" `
94+
#-s:h compiler.cppstd=17 `
95+
#-c:h tools.microsoft:winsdk_version=10.0.17763.0 `
96+
#-s:h compiler.runtime=static
97+
#env:
98+
#CONAN_USER_HOME: c:/cache
99+
#CONAN_USER_HOME_SHORT: c:/cache/conan_shortpaths
99100

100101
build_macos:
101102
if: github.repository_owner == 'viamrobotics'

‎.github/workflows/release.yml‎

Lines changed: 86 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
name: Build + draft release
22

33
on:
4-
pull_request:
54
workflow_dispatch:
65

76
# (erodkin) this is needed to create the release, per https://github.com/softprops/action-gh-release/issues/236
@@ -10,7 +9,7 @@ permissions:
109

1110
jobs:
1211
prepare:
13-
#if: github.repository_owner == 'viamrobotics'
12+
if: github.repository_owner == 'viamrobotics'
1413
runs-on: ubuntu-latest
1514
outputs:
1615
version: ${{ steps.which_version.outputs.version }}
@@ -33,88 +32,90 @@ jobs:
3332
releaseName: releases/v${{ steps.which_version.outputs.version }}
3433
doNotFailIfNotFound: 'true'
3534

36-
#- name: Cancelling - release already exists
37-
#uses: andymckay/[email protected]
38-
#if: steps.release_exists.outputs.id != ''
39-
40-
build_windows:
41-
#if: github.repository_owner == 'viamrobotics'
42-
needs: [prepare]
43-
runs-on: windows-latest
44-
strategy:
45-
fail-fast: false
46-
matrix:
47-
include:
48-
- target: x86_64-windows
49-
platform: windows_x86_64
50-
steps:
51-
- name: Checkout Code
52-
uses: actions/checkout@v4
53-
with:
54-
ref: ${{ needs.prepare.outputs.sha }}
55-
56-
- name: Install cmake
57-
uses: ssrobins/install-cmake@v1
58-
with:
59-
version: 3.27.2
60-
61-
- name: Install python
62-
uses: actions/setup-python@v5
63-
with:
64-
python-version: '3.12'
65-
66-
- name: Install Scoop
67-
uses: MinoruSekine/[email protected]
68-
69-
- name: install buf 'n stuff
70-
run: scoop install buf ninja
71-
72-
- name: Install dependencies
73-
uses: crazy-max/ghaction-chocolatey@v3
74-
with:
75-
args: install -y conan git 7zip jq
76-
77-
78-
# Ensures that things installed with choco are visible to us
79-
- name: refresh env
80-
run: |
81-
Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1
82-
refreshenv
83-
84-
- name: Create package
85-
shell: powershell
86-
run: |
87-
Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1
88-
refreshenv
89-
conan profile detect
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
96-
env:
97-
CONAN_USER_HOME: c:/cache
98-
CONAN_USER_HOME_SHORT: c:/cache/conan_shortpaths
99-
100-
- name: list stuff
101-
run: |
102-
ls
103-
ls build/
104-
105-
- name: Copy
106-
run: |
107-
cmake --install build --prefix builds/viam-cpp-sdk-${{ matrix.platform }}
108-
109-
- name: Create tar
110-
run: |
111-
tar -czvf builds/viam-cpp-sdk-${{ matrix.platform }}.tar.gz builds/viam-cpp-sdk-${{ matrix.platform }}
112-
113-
- name: Upload artifacts
114-
uses: actions/upload-artifact@v4
115-
with:
116-
name: viam-cpp-sdk-${{ matrix.platform }}.tar.gz
117-
path: builds/viam-cpp-sdk-${{ matrix.platform }}.tar.gz
35+
- name: Cancelling - release already exists
36+
uses: andymckay/[email protected]
37+
if: steps.release_exists.outputs.id != ''
38+
39+
40+
# TODO (RSDK-10638) - uncomment and make all this work once we have good rust-utils windows builds
41+
#build_windows:
42+
##if: github.repository_owner == 'viamrobotics'
43+
#needs: [prepare]
44+
#runs-on: windows-latest
45+
#strategy:
46+
#fail-fast: false
47+
#matrix:
48+
#include:
49+
#- target: x86_64-windows
50+
#platform: windows_x86_64
51+
#steps:
52+
#- name: Checkout Code
53+
#uses: actions/checkout@v4
54+
#with:
55+
#ref: ${{ needs.prepare.outputs.sha }}
56+
57+
#- name: Install cmake
58+
#uses: ssrobins/install-cmake@v1
59+
#with:
60+
#version: 3.27.2
61+
62+
#- name: Install python
63+
#uses: actions/setup-python@v5
64+
#with:
65+
#python-version: '3.12'
66+
67+
#- name: Install Scoop
68+
#uses: MinoruSekine/[email protected]
69+
70+
#- name: install buf 'n stuff
71+
#run: scoop install buf ninja
72+
73+
#- name: Install dependencies
74+
#uses: crazy-max/ghaction-chocolatey@v3
75+
#with:
76+
#args: install -y conan git 7zip jq
77+
78+
79+
## Ensures that things installed with choco are visible to us
80+
#- name: refresh env
81+
#run: |
82+
#Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1
83+
#refreshenv
84+
85+
#- name: Create package
86+
#shell: powershell
87+
#run: |
88+
#Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1
89+
#refreshenv
90+
#conan profile detect
91+
#conan create . `
92+
#--build=missing `
93+
#-o "&:shared=False" `
94+
#-s:h compiler.cppstd=17 `
95+
#-c:h tools.microsoft:winsdk_version=10.0.17763.0 `
96+
#-s:h compiler.runtime=static
97+
#env:
98+
#CONAN_USER_HOME: c:/cache
99+
#CONAN_USER_HOME_SHORT: c:/cache/conan_shortpaths
100+
101+
#- name: list stuff
102+
#run: |
103+
#ls
104+
#ls build/
105+
106+
#- name: Copy
107+
#run: |
108+
#cmake --install build --prefix builds/viam-cpp-sdk-${{ matrix.platform }}
109+
110+
#- name: Create tar
111+
#run: |
112+
#tar -czvf builds/viam-cpp-sdk-${{ matrix.platform }}.tar.gz builds/viam-cpp-sdk-${{ matrix.platform }}
113+
114+
#- name: Upload artifacts
115+
#uses: actions/upload-artifact@v4
116+
#with:
117+
#name: viam-cpp-sdk-${{ matrix.platform }}.tar.gz
118+
#path: builds/viam-cpp-sdk-${{ matrix.platform }}.tar.gz
118119

119120
build_macos:
120121
if: github.repository_owner == 'viamrobotics'
@@ -349,7 +350,7 @@ jobs:
349350
path: builds/viam-cpp-sdk-${{ matrix.platform }}.tar.gz
350351

351352
release:
352-
needs: [prepare, build_macos, build_linux_debian, build_linux_ubuntu_jammy, build_windows]
353+
needs: [prepare, build_macos, build_linux_debian, build_linux_ubuntu_jammy]
353354
if: github.repository_owner == 'viamrobotics'
354355
runs-on: ubuntu-latest
355356

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
/build/*
66

77
# For now, ignore any viam_rust_utils library in the root.
8+
# The `lib` prefix is on unix-based systems only
89
/libviam_rust_utils*
10+
/viam_rust_utils*
911

1012
# Ignore clang cache.
1113
/.cache/

0 commit comments

Comments
 (0)