Skip to content

Commit 94246a3

Browse files
mathbunnyrumathbunnyru
authored
Don't use matrix.image-variant, use 2 separate variables (#2217)
1 parent 3fc8373 commit 94246a3

File tree

1 file changed

+71
-69
lines changed

1 file changed

+71
-69
lines changed

‎.github/workflows/docker.yml‎

Lines changed: 71 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -311,27 +311,28 @@ jobs:
311311
uses: ./.github/workflows/docker-tag-push.yml
312312
with:
313313
platform: aarch64
314-
image: ${{ matrix.image-variant.image }}
315-
variant: ${{ matrix.image-variant.variant }}
314+
image: ${{ matrix.image }}
315+
variant: ${{ matrix.variant }}
316316
secrets:
317317
REGISTRY_USERNAME: ${{ secrets.QUAY_USERNAME }}
318318
REGISTRY_TOKEN: ${{ secrets.QUAY_ROBOT_TOKEN }}
319319
strategy:
320320
matrix:
321-
image-variant:
321+
image:
322322
[
323-
{ image: docker-stacks-foundation, variant: default },
324-
{ image: base-notebook, variant: default },
325-
{ image: minimal-notebook, variant: default },
326-
{ image: scipy-notebook, variant: default },
327-
{ image: r-notebook, variant: default },
328-
{ image: julia-notebook, variant: default },
329-
{ image: tensorflow-notebook, variant: default },
330-
{ image: pytorch-notebook, variant: default },
331-
{ image: datascience-notebook, variant: default },
332-
{ image: pyspark-notebook, variant: default },
333-
{ image: all-spark-notebook, variant: default },
323+
docker-stacks-foundation,
324+
base-notebook,
325+
minimal-notebook,
326+
scipy-notebook,
327+
r-notebook,
328+
julia-notebook,
329+
tensorflow-notebook,
330+
pytorch-notebook,
331+
datascience-notebook,
332+
pyspark-notebook,
333+
all-spark-notebook,
334334
]
335+
variant: [default]
335336
needs:
336337
[
337338
aarch64-foundation,
@@ -352,49 +353,51 @@ jobs:
352353
uses: ./.github/workflows/docker-tag-push.yml
353354
with:
354355
platform: aarch64
355-
image: ${{ matrix.image-variant.image }}
356-
variant: ${{ matrix.image-variant.variant }}
356+
image: ${{ matrix.image }}
357+
variant: ${{ matrix.variant }}
357358
secrets:
358359
REGISTRY_USERNAME: ${{ secrets.QUAY_USERNAME }}
359360
REGISTRY_TOKEN: ${{ secrets.QUAY_ROBOT_TOKEN }}
360361
strategy:
361362
matrix:
362-
image-variant:
363-
[
364-
{ image: docker-stacks-foundation, variant: default },
365-
{ image: base-notebook, variant: default },
366-
]
363+
image: [docker-stacks-foundation, base-notebook]
364+
variant: [default]
367365
needs: [aarch64-foundation, aarch64-base]
368366
if: contains(github.event.pull_request.title, '[FAST_BUILD]')
369367

370368
x86_64-images-tag-push:
371369
uses: ./.github/workflows/docker-tag-push.yml
372370
with:
373371
platform: x86_64
374-
image: ${{ matrix.image-variant.image }}
375-
variant: ${{ matrix.image-variant.variant }}
372+
image: ${{ matrix.image }}
373+
variant: ${{ matrix.variant }}
376374
secrets:
377375
REGISTRY_USERNAME: ${{ secrets.QUAY_USERNAME }}
378376
REGISTRY_TOKEN: ${{ secrets.QUAY_ROBOT_TOKEN }}
379377
strategy:
380378
matrix:
381-
image-variant:
379+
image:
382380
[
383-
{ image: docker-stacks-foundation, variant: default },
384-
{ image: base-notebook, variant: default },
385-
{ image: minimal-notebook, variant: default },
386-
{ image: scipy-notebook, variant: default },
387-
{ image: r-notebook, variant: default },
388-
{ image: julia-notebook, variant: default },
389-
{ image: tensorflow-notebook, variant: default },
390-
{ image: tensorflow-notebook, variant: cuda },
391-
{ image: pytorch-notebook, variant: default },
392-
{ image: pytorch-notebook, variant: cuda11 },
393-
{ image: pytorch-notebook, variant: cuda12 },
394-
{ image: datascience-notebook, variant: default },
395-
{ image: pyspark-notebook, variant: default },
396-
{ image: all-spark-notebook, variant: default },
381+
docker-stacks-foundation,
382+
base-notebook,
383+
minimal-notebook,
384+
scipy-notebook,
385+
r-notebook,
386+
julia-notebook,
387+
tensorflow-notebook,
388+
pytorch-notebook,
389+
datascience-notebook,
390+
pyspark-notebook,
391+
all-spark-notebook,
397392
]
393+
variant: [default]
394+
include:
395+
- image: tensorflow-notebook
396+
variant: cuda
397+
- image: pytorch-notebook
398+
variant: cuda11
399+
- image: pytorch-notebook
400+
variant: cuda12
398401
needs:
399402
[
400403
x86_64-foundation,
@@ -415,66 +418,65 @@ jobs:
415418
uses: ./.github/workflows/docker-tag-push.yml
416419
with:
417420
platform: x86_64
418-
image: ${{ matrix.image-variant.image }}
419-
variant: ${{ matrix.image-variant.variant }}
421+
image: ${{ matrix.image }}
422+
variant: ${{ matrix.variant }}
420423
secrets:
421424
REGISTRY_USERNAME: ${{ secrets.QUAY_USERNAME }}
422425
REGISTRY_TOKEN: ${{ secrets.QUAY_ROBOT_TOKEN }}
423426
strategy:
424427
matrix:
425-
image-variant:
426-
[
427-
{ image: docker-stacks-foundation, variant: default },
428-
{ image: base-notebook, variant: default },
429-
]
428+
image: [docker-stacks-foundation, base-notebook]
429+
variant: [default]
430430
needs: [x86_64-foundation, x86_64-base]
431431
if: contains(github.event.pull_request.title, '[FAST_BUILD]')
432432

433433
merge-tags:
434434
uses: ./.github/workflows/docker-merge-tags.yml
435435
with:
436-
image: ${{ matrix.image-variant.image }}
437-
variant: ${{ matrix.image-variant.variant }}
436+
image: ${{ matrix.image }}
437+
variant: ${{ matrix.variant }}
438438
secrets:
439439
REGISTRY_USERNAME: ${{ secrets.QUAY_USERNAME }}
440440
REGISTRY_TOKEN: ${{ secrets.QUAY_ROBOT_TOKEN }}
441441
strategy:
442442
matrix:
443-
image-variant:
443+
image:
444444
[
445-
{ image: docker-stacks-foundation, variant: default },
446-
{ image: base-notebook, variant: default },
447-
{ image: minimal-notebook, variant: default },
448-
{ image: scipy-notebook, variant: default },
449-
{ image: r-notebook, variant: default },
450-
{ image: julia-notebook, variant: default },
451-
{ image: tensorflow-notebook, variant: default },
452-
{ image: tensorflow-notebook, variant: cuda },
453-
{ image: pytorch-notebook, variant: default },
454-
{ image: pytorch-notebook, variant: cuda11 },
455-
{ image: pytorch-notebook, variant: cuda12 },
456-
{ image: datascience-notebook, variant: default },
457-
{ image: pyspark-notebook, variant: default },
458-
{ image: all-spark-notebook, variant: default },
445+
docker-stacks-foundation,
446+
base-notebook,
447+
minimal-notebook,
448+
scipy-notebook,
449+
r-notebook,
450+
julia-notebook,
451+
tensorflow-notebook,
452+
pytorch-notebook,
453+
datascience-notebook,
454+
pyspark-notebook,
455+
all-spark-notebook,
459456
]
457+
variant: [default]
458+
include:
459+
- image: tensorflow-notebook
460+
variant: cuda
461+
- image: pytorch-notebook
462+
variant: cuda11
463+
- image: pytorch-notebook
464+
variant: cuda12
460465
needs: [aarch64-images-tag-push, x86_64-images-tag-push]
461466
if: (github.repository_owner == 'jupyter' || github.repository_owner == 'mathbunnyru') && !contains(github.event.pull_request.title, '[FAST_BUILD]')
462467

463468
merge-tags-fast:
464469
uses: ./.github/workflows/docker-merge-tags.yml
465470
with:
466-
image: ${{ matrix.image-variant.image }}
467-
variant: ${{ matrix.image-variant.variant }}
471+
image: ${{ matrix.image }}
472+
variant: ${{ matrix.variant }}
468473
secrets:
469474
REGISTRY_USERNAME: ${{ secrets.QUAY_USERNAME }}
470475
REGISTRY_TOKEN: ${{ secrets.QUAY_ROBOT_TOKEN }}
471476
strategy:
472477
matrix:
473-
image-variant:
474-
[
475-
{ image: docker-stacks-foundation, variant: default },
476-
{ image: base-notebook, variant: default },
477-
]
478+
image: [docker-stacks-foundation, base-notebook]
479+
variant: [default]
478480
needs: [aarch64-images-tag-push-fast, x86_64-images-tag-push-fast]
479481
if: (github.repository_owner == 'jupyter' || github.repository_owner == 'mathbunnyru') && contains(github.event.pull_request.title, '[FAST_BUILD]')
480482

0 commit comments

Comments
 (0)