summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2017-07-12 13:35:10 +0100
committerJavier Jardón <jjardon@gnome.org>2017-07-14 11:15:31 +0100
commit9c6988b82b5bd0dc116727cee98ac1779dd41726 (patch)
tree80672dce65293eb5fb0fd3fb423445d40d0436c8
parentaf24e88dc178af3c2a767d5c0c42cabf5f229c3b (diff)
downloaddefinitions-9c6988b82b5bd0dc116727cee98ac1779dd41726.tar.gz
.gitlab-ci.yml: Use same folder to store buildstream converted metadata
-rw-r--r--.gitlab-ci.yml8
1 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1da89ea2..09ffe309 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,12 +32,12 @@ 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-metadata/build-system/elements
+ --output buildstream-metadata/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
+ --output buildstream-metadata/elements
--rebase strata/build-essential.morph gnu-toolchain.bst
gnome/systems/gnome-system-x86_64.morph x86_64
artifacts:
@@ -52,7 +52,7 @@ validate-all-definitions:
bst-build-system-x86_32-build:
stage: build-1
script:
- - bst -C buildstream-metadata/build-system build build-system-x86_64-content.bst
+ - bst -C buildstream-metadata build build-system-x86_64-content.bst
dependencies:
- migrate-bst
@@ -114,7 +114,7 @@ gnome-build-64:
bst-gnome-build-64:
stage: build-3
script:
- - bst -C buildstream-metadata/gnome-system build gnome/gnome-system-x86_64-content.bst
+ - bst -C buildstream-metadata build gnome/gnome-system-x86_64-content.bst
dependencies:
- migrate-bst