From fa91b837f4bf46b19678a2c3d6b56f73cdc786a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Sun, 26 Nov 2017 23:00:23 +0000 Subject: CI: keep conversion of the last commit with definition in YBD format --- .gitlab-ci.yml | 4 ++++ convert | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3b44e233..842e8edc 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 4bce87e9..e41b44f9 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 -- cgit v1.2.1