[gnome-build-meta/valentindavid/eos-installer: 10/11] ci: Build installer image nightly

[Valentin David <valentindavid src gnome org>]

commit 16251940476727ec552a0749a728227e684f1b7a
Author: Valentin David <valentin david codethink co uk>
Date:   Wed Apr 8 12:06:20 2020 +0200

    ci: Build installer image nightly

 .gitlab-ci.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a9ece8f6..f6b36c6a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -103,8 +103,11 @@ default:
 .vm-image-template:
   stage: image
   script:
-    - ${BST_NO_PUSH} --max-jobs $(( $(nproc) / 4 )) -o arch "${ARCH}" build vm/image.bst
-    - ${BST_NO_PUSH} -o arch "${ARCH}" checkout --hardlinks vm/image.bst image
+    - ${BST_NO_PUSH} --max-jobs $(( $(nproc) / 4 )) -o arch "${ARCH}" build vm/image.bst iso/image.bst
+    - ${BST_NO_PUSH} -o arch "${ARCH}" checkout --hardlinks vm/image.bst vm
+    - ${BST_NO_PUSH} -o arch "${ARCH}" checkout --hardlinks iso/image.bst iso
+    - mkdir -p image
+    - mv vm/* iso/* image/
   rules:
   - if: $CI_COMMIT_REF_NAME == "master" || $CI_COMMIT_REF_NAME =~ /^gnome-\d-\d\d$/
     when: on_success
@@ -200,7 +203,7 @@ track:
   interruptible: true
   script:
   - 'sed -i "s/track-tags: False/track-tags: ${BST_TRACK_TAGS}/" project.conf'
-  - ${BST} track --deps all core.bst flatpak-runtimes.bst vm/image.bst boards/pinebook-pro/image.bst 
boards/rock64/image.bst boards/raspberrypi-4/image.bst
+  - ${BST} track --deps all core.bst flatpak-runtimes.bst iso/image.bst boards/pinebook-pro/image.bst 
boards/rock64/image.bst boards/raspberrypi-4/image.bst
   retry: 2
   # only run on branches targeting master
   rules: