mirror of
https://gitlab.winehq.org/wine/vkd3d.git
synced 2024-11-21 16:46:41 -08:00
ci: Build the macOS image each time the Linux image is built.
This commit is contained in:
parent
4f589356f1
commit
9c0d04c862
Notes:
Alexandre Julliard
2024-04-04 22:42:59 +02:00
Approved-by: Giovanni Mascellani (@giomasce) Approved-by: Henri Verbeet (@hverbeet) Approved-by: Alexandre Julliard (@julliard) Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/760
@ -19,6 +19,10 @@ image-linux:
|
|||||||
- sed -i "1iFROM $IMAGE_SOURCE" "$DOCKER_FILE"
|
- sed -i "1iFROM $IMAGE_SOURCE" "$DOCKER_FILE"
|
||||||
- /kaniko/executor --context "$CI_PROJECT_DIR" --dockerfile "$DOCKER_FILE" --destination "$IMAGE_LOCAL"
|
- /kaniko/executor --context "$CI_PROJECT_DIR" --dockerfile "$DOCKER_FILE" --destination "$IMAGE_LOCAL"
|
||||||
|
|
||||||
|
# Job `image-mac' must be run each time the pipeline is run on a push,
|
||||||
|
# otherwise macOS artifacts are not regenerated and macOS jobs cannot find them.
|
||||||
|
# So we add a dependency on image.docker too, even if that file is not really
|
||||||
|
# used for macOS.
|
||||||
image-mac:
|
image-mac:
|
||||||
stage: image
|
stage: image
|
||||||
rules:
|
rules:
|
||||||
@ -26,6 +30,7 @@ image-mac:
|
|||||||
changes:
|
changes:
|
||||||
- .gitlab-ci.yml
|
- .gitlab-ci.yml
|
||||||
- gitlab/image.yml
|
- gitlab/image.yml
|
||||||
|
- gitlab/image.docker
|
||||||
interruptible: true
|
interruptible: true
|
||||||
tags:
|
tags:
|
||||||
- mac
|
- mac
|
||||||
|
Loading…
Reference in New Issue
Block a user