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-25 23:17:42 +0100
commit5b541059a24ff6cb9b04c3a36f122c6f2e5658dc (patch)
treec55ec595b46d7d86c618ee48956ae0b1787d0c17
parent5b60524063aeb9ccf850b4764f577f39761f3f42 (diff)
downloaddefinitions-5b541059a24ff6cb9b04c3a36f122c6f2e5658dc.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 d7d01456..46aae063 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,12 +37,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:
@@ -57,7 +57,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
@@ -119,7 +119,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