summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2017-10-25 15:10:08 +0100
committerJavier Jardón <jjardon@gnome.org>2017-10-26 11:40:00 +0100
commit56885a36e5c3830a6c6c7a663730a8a297a5825c (patch)
treec642ad149c261f7d2c33aba7ed595e81200972de
parent94b209c9a799a6a5316587df5d74960386ee0e86 (diff)
downloaddefinitions-jjardon/no_master2.tar.gz
.gitlab-ci.yml: Use specific version of ybd, spec, defs2bstjjardon/no_master2
Current master of all those
-rw-r--r--.gitlab-ci.yml10
1 files changed, 8 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index afd25962..35ac772e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,10 @@ variables:
XDG_CACHE_HOME: "${CI_PROJECT_DIR}/.cache"
YBD_base: "/cache/ybd_base"
YBD_gits: "${CI_PROJECT_DIR}/.cache/ybd_base/gits"
+ YBD_SHA: '157986cb2f7c0b95e0e4e0bf3a39547f548a298d'
+ SPEC_SHA: '715023f3cf6e714839fb56236ade20de40855bd4'
BST_SHA: 'b14a0c575991f3b75aa15b21b2652186b62d0a09'
+ DEFS2BST_SHA: '7572160e23b35b11872148c280bd6f9b5da900bb'
GET_SOURCES_ATTEMPTS: 3
# Store all the downloaded git and ostree repos in the distributed cache.
@@ -32,9 +35,10 @@ variables:
# Install and configure YBD
- |
export LC_ALL="C.UTF-8"
- export CI_YBD_BRANCH=`[[ "$CI_BUILD_REF_NAME" =~ ^staging/fromybd/ ]] && echo -b ${CI_BUILD_REF_NAME#staging/fromybd/}`
git clone https://gitlab.com/baserock/spec.git
- git clone https://gitlab.com/baserock/ybd.git $CI_YBD_BRANCH
+ git -C spec checkout $SPEC_SHA
+ git clone https://gitlab.com/baserock/ybd.git
+ git -C ybd checkout $YBD_SHA
cd ybd && ./install_dependencies.sh && cd ..
pip install -r spec/requirements.txt
@@ -240,9 +244,11 @@ bst-convert:
- |
if [ ! -d ./ybd ]; then
git clone https://gitlab.com/baserock/ybd.git
+ git -C ybd checkout $YBD_SHA
cd ybd && ./install_dependencies.sh && cd -
fi
git clone https://gitlab.com/BuildStream/defs2bst.git
+ git -C defs2bst checkout $DEFS2BST_SHA
echo "defs2bst version: $(git -C ./defs2bst rev-parse HEAD)"
- ./convert
artifacts: