[PATCH 0/1] MR760: ci: Build the macOS image each time the Linux image is built.

[PATCH 1/1] ci: Build the macOS image each time the Linux image is built.

[Giovanni Mascellani]

From: Giovanni Mascellani

---
 gitlab/image.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/gitlab/image.yml b/gitlab/image.yml
index c93ea0d66..8b235a66c 100644
--- a/gitlab/image.yml
+++ b/gitlab/image.yml
@@ -19,6 +19,10 @@ image-linux:
     - sed -i "1iFROM $IMAGE_SOURCE" "$DOCKER_FILE"
     - /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:
   stage: image
   rules:
@@ -26,6 +30,7 @@ image-mac:
       changes:
         - .gitlab-ci.yml
         - gitlab/image.yml
+        - gitlab/image.docker
   interruptible: true
   tags:
     - mac

[PATCH 0/1] MR760: ci: Build the macOS image each time the Linux image is built. - approved

[Giovanni Mascellani (＠giomasce)]

This merge request was approved by Giovanni Mascellani.

[PATCH 0/1] MR760: ci: Build the macOS image each time the Linux image is built. - approved

[Henri Verbeet (＠hverbeet)]

This merge request was approved by Henri Verbeet.