From c00e344295fd25da16cbdbe52b681cf46d0d27a6 Mon Sep 17 00:00:00 2001
From: Hanspeter Portner <dev@open-music-kontrollers.ch>
Date: Mon, 12 Oct 2020 20:53:17 +0200
Subject: [PATCH] Squashed 'gitlab-ci/' changes from eeba83f..b03a3c0

b03a3c0 define global variables.

git-subtree-dir: gitlab-ci
git-subtree-split: b03a3c0c20181a70144e989ec7aa3dd96fa71f59
---
 generic.yml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/generic.yml b/generic.yml
index aca2fe2..5cd2abc 100644
--- a/generic.yml
+++ b/generic.yml
@@ -2,13 +2,11 @@ stages:
   - build
   - deploy
 
-.variables_template: &variables_definition
-  variables:
-    PKG_CONFIG_PATH: "/opt/lv2/lib/pkgconfig:/opt/${CI_BUILD_NAME}/lib/pkgconfig:/usr/lib/${CI_BUILD_NAME}/pkgconfig"
-    #BUILD_OPTS: "-Dbuild-inline-disp=true -Dbuild-next-ui=false -Duse-fontconfig=disabled -Duse-vterm=disabled"
+variables:
+  PKG_CONFIG_PATH: "/opt/lv2/lib/pkgconfig:/opt/${CI_BUILD_NAME}/lib/pkgconfig:/usr/lib/${CI_BUILD_NAME}/pkgconfig"
+  BUILD_OPTS : ""
 
 .native_template: &native_definition
-  <<: *variables_definition
   stage: build
   script:
     - meson --prefix="${CI_PROJECT_DIR}/${CI_PROJECT_NAME}-$(cat VERSION)/${CI_BUILD_NAME}" -Dlv2libdir="" --cross-file "${CI_BUILD_NAME}" ${BUILD_OPTS} build
@@ -25,7 +23,6 @@ stages:
       - "${CI_PROJECT_NAME}-$(cat VERSION)/${CI_BUILD_NAME}/"
 
 .cross_template: &cross_definition
-  <<: *variables_definition
   stage: build
   script:
     - meson --prefix="${CI_PROJECT_DIR}/${CI_PROJECT_NAME}-$(cat VERSION)/${CI_BUILD_NAME}" -Dlv2libdir="" --cross-file "${CI_BUILD_NAME}" ${BUILD_OPTS} build
@@ -100,7 +97,6 @@ aarch64-linux-gnu-bullseye:
   <<: *arm_linux_definition_bullseye
 
 pack:
-  <<: *variables_definition
   stage: deploy
   script:
     - echo 'packing up'
-- 
2.38.5