summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2017-11-26 23:00:23 (GMT)
committerJavier Jardón <jjardon@gnome.org>2017-12-12 15:53:20 (GMT)
commitfa91b837f4bf46b19678a2c3d6b56f73cdc786a6 (patch)
tree115903010f539603b39749f5df625c711c07d338
parent5865e9cbb543e044b9e1f558fe78eda36da1982f (diff)
downloaddefinitions-fa91b837f4bf46b19678a2c3d6b56f73cdc786a6.tar.gz
CI: keep conversion of the last commit with definition in YBD format
-rw-r--r--.gitlab-ci.yml4
-rwxr-xr-xconvert2
2 files changed, 5 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3b44e23..842e8ed 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -79,6 +79,10 @@ bst-convert:
stage: preprocess
<<: *bst_before_script
script:
+ # Clone last version of definitions with YBD systems
+ - export DEFINITIONS_YBD_SHA='8f8992a18d55c3abf28d4b6fc8036bd39d3dc1cf'
+ - git clone https://gitlab.com/baserock/definitions.git old-definitions-morph-format
+ - git -C old-definitions-morph-format checkout $DEFINITIONS_YBD_SHA
# Install YBD and defs2bst
- |
if [ ! -d ./ybd ]; then
diff --git a/convert b/convert
index 4bce87e..e41b44f 100755
--- a/convert
+++ b/convert
@@ -33,7 +33,7 @@ for system_morph in $systems; do
# file for every chunk involved in the build, and will produce a file named
# something like XX-system-x86_64-content.bst from the system .morph file.
$CONVERTER --ybd $YBD \
- --definitions ./ \
+ --definitions old-definitions-morph-format \
--output ./elements \
--rebase strata/build-essential.morph gnu-toolchain.bst \
$system_morph x86_64