Pass variables to CI scripts via environment variableswq

ef1720cb · Jan Möbius · 82796ade · ef1720cb · ef1720cb
Commit ef1720cb authored Dec 08, 2016 by Jan Möbius
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 5 deletions

.gitlab-ci.yml .gitlab-ci.yml +10 -2

OpenFlipper/CI/ci-linux.sh OpenFlipper/CI/ci-linux.sh +4 -3

No files found.
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
 gcc-c++11-Qt5:
-  script: "OpenFlipper/CI/ci-linux.sh gcc C++11 QT5"
+  variables:     
+    COMPILER:       "gcc"     
+    LANGUAGE:       "C++11"     
+    QTVERSION:      "QT5"     
+  script: "OpenFlipper/CI/ci-linux.sh"
  tags:
    - Linux

 clang-c++11-Qt5:
-  script: "OpenFlipper/CI/ci-linux.sh clang C++11 QT5"
+  variables:
+    COMPILER:       "clang"     
+    LANGUAGE:       "C++11"   
+    QTVERSION:      "QT5"     
+  script: "OpenFlipper/CI/ci-linux.sh"
  tags:
    - Linux
    - MultiThreads

--- a/OpenFlipper/CI/ci-linux.sh
+++ b/OpenFlipper/CI/ci-linux.sh
@@ -3,9 +3,10 @@
 # Script abort on error
 set -e

-COMPILER=$1
-LANGUAGE=$2
-QTVERSION=$3
+# Expected Settings via environment variables:
+# COMPILER= gcc/clang
+# LANGUAGE= C++98 / C++11
+# QTVERSION= QT4/QT5

 OPTIONS=""
 MAKE_OPTIONS=""