Skip to content

Commit 3608fb6

Browse files
committed
Remove --use-conan from GHA workflows
Signed-off-by: Jean-Francois Panisset <panisset@gmail.com>
1 parent 6f21595 commit 3608fb6

File tree

2 files changed

+13
-18
lines changed

2 files changed

+13
-18
lines changed

.github/workflows/docker-builds.yml

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,18 @@ jobs:
8888
--version ${{ matrix.common_version_noclang }} \
8989
--push NO
9090
91+
- name: Build common wrappers (Conan)
92+
run: |
93+
set -ex
94+
uv run aswfdocker \
95+
--verbose \
96+
build \
97+
--ci-image-type PACKAGE \
98+
--group common-wrappers \
99+
--version ${{ matrix.common_version_noclang }} \
100+
--build-missing \
101+
--push NO
102+
91103
- name: Build Ninja and CMake (Conan)
92104
run: |
93105
set -ex
@@ -97,7 +109,6 @@ jobs:
97109
--ci-image-type PACKAGE \
98110
--group common \
99111
--version ${{ matrix.common_version_noclang }} \
100-
--use-conan \
101112
--build-missing \
102113
--target ninja \
103114
--target cmake \
@@ -112,7 +123,6 @@ jobs:
112123
--ci-image-type PACKAGE \
113124
--group common \
114125
--version ${{ matrix.common_version }} \
115-
--use-conan \
116126
--build-missing \
117127
--target clang \
118128
--push NO
@@ -136,7 +146,6 @@ jobs:
136146
--ci-image-type PACKAGE \
137147
--group base1-wrappers \
138148
--version ${{ matrix.version_noclang }} \
139-
--use-conan \
140149
--build-missing \
141150
--push NO
142151
@@ -149,7 +158,6 @@ jobs:
149158
--ci-image-type PACKAGE \
150159
--group base1-1 \
151160
--version ${{ matrix.version_noclang }} \
152-
--use-conan \
153161
--build-missing \
154162
--push NO
155163
@@ -162,7 +170,6 @@ jobs:
162170
--ci-image-type PACKAGE \
163171
--group base1-2 \
164172
--version ${{ matrix.version_noclang }} \
165-
--use-conan \
166173
--build-missing \
167174
--push NO
168175
@@ -175,7 +182,6 @@ jobs:
175182
--ci-image-type PACKAGE \
176183
--group base1-3 \
177184
--version ${{ matrix.version_noclang }} \
178-
--use-conan \
179185
--build-missing \
180186
--push NO
181187
@@ -188,7 +194,6 @@ jobs:
188194
--ci-image-type PACKAGE \
189195
--group base2-wrappers \
190196
--version ${{ matrix.version_noclang }} \
191-
--use-conan \
192197
--build-missing \
193198
--push NO
194199
@@ -201,7 +206,6 @@ jobs:
201206
--ci-image-type PACKAGE \
202207
--group base2-1
203208
--version ${{ matrix.version_noclang }} \
204-
--use-conan \
205209
--build-missing \
206210
--push NO
207211
@@ -214,7 +218,6 @@ jobs:
214218
--ci-image-type PACKAGE \
215219
--group base2-2 \
216220
--version ${{ matrix.version_noclang }} \
217-
--use-conan \
218221
--build-missing \
219222
--push NO
220223
@@ -227,7 +230,6 @@ jobs:
227230
--ci-image-type PACKAGE \
228231
--group base3 \
229232
--version ${{ matrix.version_noclang }} \
230-
--use-conan \
231233
--build-missing \
232234
--push NO
233235
@@ -251,7 +253,6 @@ jobs:
251253
--ci-image-type PACKAGE \
252254
--group vfx1-wrappers \
253255
--version ${{ matrix.version_noclang }} \
254-
--use-conan \
255256
--build-missing \
256257
--push NO
257258
@@ -264,7 +265,6 @@ jobs:
264265
--ci-image-type PACKAGE \
265266
--group vfx1-1 \
266267
--version ${{ matrix.version_noclang }} \
267-
--use-conan \
268268
--build-missing \
269269
--push NO
270270
@@ -277,7 +277,6 @@ jobs:
277277
--ci-image-type PACKAGE \
278278
--group vfx1-2 \
279279
--version ${{ matrix.version_noclang }} \
280-
--use-conan \
281280
--build-missing \
282281
--push NO
283282
@@ -290,7 +289,6 @@ jobs:
290289
--ci-image-type PACKAGE \
291290
--group vfx1-3 \
292291
--version ${{ matrix.version_noclang }} \
293-
--use-conan \
294292
--build-missing \
295293
--push NO
296294
@@ -303,7 +301,6 @@ jobs:
303301
--ci-image-type PACKAGE \
304302
--group vfx1-4 \
305303
--version ${{ matrix.version_noclang }} \
306-
--use-conan \
307304
--build-missing \
308305
--push NO
309306
@@ -316,7 +313,6 @@ jobs:
316313
--ci-image-type PACKAGE \
317314
--group vfx1-5 \
318315
--version ${{ matrix.version_noclang }} \
319-
--use-conan \
320316
--build-missing \
321317
--push NO
322318
@@ -329,7 +325,6 @@ jobs:
329325
--ci-image-type PACKAGE \
330326
--group vfx1-6 \
331327
--version ${{ matrix.version_noclang }} \
332-
--use-conan \
333328
--build-missing \
334329
--push NO
335330

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
build: true
2424
push_description: true
2525
- group: conan
26-
args: --use-conan
26+
args: ""
2727
build: ${{ contains(github.ref, '/ci-package') }}
2828
push_description: false
2929

0 commit comments

Comments
 (0)