[libdazzle/alatiera/bst-ci] CI: Abstract the element built



commit d9aac51e380f10d959066ca7396a4f1876dcc9d3
Author: Jordan Petridis <jpetridis gnome org>
Date:   Fri Sep 28 10:07:44 2018 +0300

    CI: Abstract the element built

 .gitlab-ci.yml | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8bb85b6..b02d1d0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,17 +1,20 @@
+variables:
+  ELEMENT: "core-deps/libdazzle.bst"
+
 stages:
   - "build"
 
-variables:
-  # Store all the bst stuff under the "${CI_PROJECT_DIR}" directory.
-  # Note that GitLab CI will only cache stuff inside the "${CI_PROJECT_DIR}" folder.
-  XDG_CACHE_HOME: "${CI_PROJECT_DIR}/cache"
-  GET_SOURCES_ATTEMPTS: 3
-  BST: "bst --config build.conf --log-file ../logs/build.log --colors"
-  BST_SHA: "d423cdc761a808960ea21302f89b5383fa9558b4" #  1.2.2
-
 bst:
   image: "buildstream/buildstream-fedora:master-118-7babd55c"
   stage: "build"
+  variables:
+    # Store all the bst stuff under the "${CI_PROJECT_DIR}" directory.
+    # Note that GitLab CI will only cache stuff inside the "${CI_PROJECT_DIR}" folder.
+    XDG_CACHE_HOME: "${CI_PROJECT_DIR}/cache"
+    GET_SOURCES_ATTEMPTS: 3
+    BST: "bst --config build.conf --log-file ../logs/build.log --colors"
+    BST_SHA: "d423cdc761a808960ea21302f89b5383fa9558b4" #  1.2.2
+
   before_script:
     # Remove any installed buildstream binary
     - pip3 uninstall -y buildstream
@@ -28,12 +31,12 @@ bst:
     - mkdir -p logs
   script:
     - cd gnome-build-meta/
-    - ${BST} track core-deps/libdazzle.bst
-    - ${BST} build --track-all core-deps/libdazzle.bst
-    - ${BST} workspace open -f core-deps/libdazzle.bst ../
-    - ${BST} build --track-all core-deps/libdazzle.bst
+    - ${BST} track ${ELEMENT}
+    - ${BST} build --track-all ${ELEMENT}
+    - ${BST} workspace open -f ${ELEMENT} ../
+    - ${BST} build --track-all ${ELEMENT}
   after_script:
-    - bst workspace close core-deps/libdazzle.bst
+    - bst workspace close ${ELEMENT}
 
   # Store all the downloaded git and ostree repos in the cache.
   # This saves us fetching them on every build


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]