summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2017-07-12 02:49:38 +0100
committerJavier Jardón <jjardon@gnome.org>2017-08-15 13:48:24 +0100
commit47cf88e4e0ca267aeaffa0a8eed621c9cf661320 (patch)
treef9a4d6c9f2e15a324a7b0c7c55924623dd025f57
parent26a60c395630be560853e521b4b705b45810a77d (diff)
downloaddefinitions-47cf88e4e0ca267aeaffa0a8eed621c9cf661320.tar.gz
.gitlab-ci.yml: Convert and build the build-system as well
-rw-r--r--.gitlab-ci.yml20
1 files changed, 16 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a3a6759c..d7d01456 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,22 +37,27 @@ migrate-bst:
- git clone https://gitlab.com/BuildStream/buildstream-tests.git -b gnu-toolchain
- ./defs2bst/defs2bst.py --ybd ybd/ybd.py
--definitions definitions
- --output buildstream-tests/elements
+ --output buildstream-metadata/build-system/elements
+ --rebase strata/build-essential.morph gnu-toolchain.bst
+ systems/build-system-x86_64.morph x86_64
+ - ./defs2bst/defs2bst.py --ybd ybd/ybd.py
+ --definitions definitions
+ --output buildstream-metadata/gnome-system/elements
--rebase strata/build-essential.morph gnu-toolchain.bst
gnome/systems/gnome-system-x86_64.morph x86_64
artifacts:
paths:
- - buildstream-tests/
+ - buildstream-metadata/
validate-all-definitions:
stage: validate
script:
- python spec/quick_check.py .
-bst-gnome-build-64:
+bst-build-system-x86_32-build:
stage: build-1
script:
- - bst -C buildstream-tests build gnome/gnome-system-x86_64-content.bst
+ - bst -C buildstream-metadata/build-system build build-system-x86_64-content.bst
dependencies:
- migrate-bst
@@ -111,6 +116,13 @@ gnome-build-64:
- ybd/ybd.py gnome/systems/gnome-system-x86_64.morph x86_64
- ybd/ybd.py systems/initramfs-x86_64.morph x86_64
+bst-gnome-build-64:
+ stage: build-3
+ script:
+ - bst -C buildstream-metadata/gnome-system build gnome/gnome-system-x86_64-content.bst
+ dependencies:
+ - migrate-bst
+
minimal-build-64:
stage: build-1
script: