Skip to content

Commit 9e36c2f

Browse files
committed
fixup
1 parent f299251 commit 9e36c2f

File tree

2 files changed

+26
-20
lines changed

2 files changed

+26
-20
lines changed

.github/workflows/conan.yml

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ jobs:
5454
- name: Checkout Code
5555
uses: actions/checkout@v4
5656

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

6262
- name: Install python
6363
uses: actions/setup-python@v5
@@ -70,8 +70,12 @@ jobs:
7070
- name: install buf 'n stuff # the official way to install somehow lol
7171
run: scoop install buf ninja
7272

73-
- name: install conan
74-
run: py -m pip install conan
73+
- name: Install conan
74+
uses: crazy-max/ghaction-chocolatey@v3
75+
with:
76+
args: install -y conan cmake
77+
#- name: install conan
78+
#run: py -m pip install conan
7579

7680
#- name: Install dependencies
7781
#run: |
@@ -80,9 +84,10 @@ jobs:
8084
#py -m pip install conan
8185

8286
- name: Create package
87+
shell: powershell
8388
run: |
84-
py -m conan profile detect
85-
py -m conan create . --build=missing -s compiler.cppstd=17
89+
conan profile detect
90+
conan create . --build=missing -s compiler.cppstd=17
8691
8792
build_macos:
8893
if: github.repository_owner == 'viamrobotics'

.github/workflows/release.yml

Lines changed: 13 additions & 12 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
@@ -69,12 +69,12 @@ jobs:
6969
- name: install buf 'n stuff # the official way to install somehow lol
7070
run: scoop install buf ninja
7171

72-
- name: install conan
73-
run: py -m pip install conan
74-
#- name: Install dependencies
75-
#uses: crazy-max/ghaction-chocolatey@v3
76-
#with:
77-
#args: install protoc pkgconfiglite
72+
#- name: install conan
73+
#run: py -m pip install conan
74+
- name: Install dependencies
75+
uses: crazy-max/ghaction-chocolatey@v3
76+
with:
77+
args: install -y conan cmake
7878

7979
#- name: Setup build directory
8080
#run: mkdir builds
@@ -84,9 +84,10 @@ jobs:
8484
#run: ls ${{ steps.install-boost.outuputs.BOOST_ROOT }}
8585

8686
- name: Create package
87+
shell: powershell
8788
run: |
88-
py -m conan profile detect
89-
py -m conan create . --build=missing -s compiler.cppstd=17
89+
conan profile detect
90+
conan create . --build=missing -s compiler.cppstd=17
9091
9192
#- name: Build
9293
#run: |

0 commit comments

Comments
 (0)