[gnome-build-meta/gbsneto/new-lock-screen-part2] Revert "CI: comment out the vm image build temporarly"
- From: Jordan Petridis <jpetridis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-build-meta/gbsneto/new-lock-screen-part2] Revert "CI: comment out the vm image build temporarly"
- Date: Mon, 16 Dec 2019 19:35:26 +0000 (UTC)
commit 5247f1c49b57679698b4f6d7820233f955d18c98
Author: Jordan Petridis <jpetridis gnome org>
Date: Mon Dec 16 21:35:03 2019 +0200
Revert "CI: comment out the vm image build temporarly"
This reverts commit 228466d2b5453f4b20dd640942eb56010270997d.
.gitlab-ci.yml | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 443ddfad..2b3c5d9a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -85,22 +85,20 @@ default:
if [ "${ARCH}" == "x86_64" ]; then
${BST} build openh264-extension.bst:flatpak-repo.bst
- # FIXME: reenable the vm build
- # https://gitlab.gnome.org/GNOME/gnome-build-meta/merge_requests/470#note_666498
#
# Don't try to push the resulting artifacts, the huge image doesnt
# work well with the artifact cache right now.
#
- # ${BST_NO_PUSH} --max-jobs $(( $(nproc) / 4 )) -o arch "${ARCH}" build
vm/desktop-vm-image-x86_64.bst
+ ${BST_NO_PUSH} --max-jobs $(( $(nproc) / 4 )) -o arch "${ARCH}" build vm/desktop-vm-image-x86_64.bst
# Checkout the image for the gitlab artifact.
#
# Accept using hardlinks here as the upload will not
# corrupt the local artifact cache.
#
- # ${BST} checkout --hardlinks vm/desktop-vm-image-x86_64.bst image
- # qemu-img convert -f raw -O qcow2 image/sda.img image/sda.qcow2
- # rm image/sda.img
+ ${BST} checkout --hardlinks vm/desktop-vm-image-x86_64.bst image
+ qemu-img convert -f raw -O qcow2 image/sda.img image/sda.qcow2
+ rm image/sda.img
fi
# Store all the downloaded git repos and tarballs in the cache.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]