[gnome-build-meta/abderrahim/buildstream-conf] .gitlab-ci: use two different buildstream config files




commit 458ba6fd181ee2b0d693b63dada1ee668db88b0b
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Fri Feb 12 09:11:19 2021 +0100

    .gitlab-ci: use two different buildstream config files
    
    CI was assuming the config file only contains the push remote, which is not
    the case

 .gitlab-ci.yml                            | 4 ++--
 build.conf => .gitlab-ci/buildstream.conf | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d47f8cf2..b1dfee51 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,8 +4,8 @@ variables:
   GET_SOURCES_ATTEMPTS: 3
   BST_STRICT: '--no-strict'
   BST_TRACK_TAGS: 'False'
-  BST_NO_PUSH: "bst $BST_STRICT --log-file logs/build.log --colors"
-  BST: "bst $BST_STRICT --config build.conf --log-file logs/build.log --colors"
+  BST_NO_PUSH: "bst $BST_STRICT --config .gitlab-ci/buildstream-nopush.conf --log-file logs/build.log 
--colors"
+  BST: "bst $BST_STRICT --config .gitlab-ci/buildstream.conf --log-file logs/build.log --colors"
   FLATPAK_BRANCH: master
 
 stages:
diff --git a/build.conf b/.gitlab-ci/buildstream.conf
similarity index 100%
rename from build.conf
rename to .gitlab-ci/buildstream.conf


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