aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanspeter Portner <dev@open-music-kontrollers.ch>2020-10-12 23:12:42 +0200
committerHanspeter Portner <dev@open-music-kontrollers.ch>2020-10-12 23:12:42 +0200
commit4e50a306d8429b143f19a589c73bd650eeb0f303 (patch)
tree95b963993302e55a4b573963f84e58ea6f92e4d1
parentae5ad3754c48892bdd3d49b0dcb9ff4c4224d1d6 (diff)
downloadprops.lv2-4e50a306d8429b143f19a589c73bd650eeb0f303.tar.xz
Squashed 'gitlab-ci/' changes from eeba83f..b03a3c0
b03a3c0 define global variables. git-subtree-dir: gitlab-ci git-subtree-split: b03a3c0c20181a70144e989ec7aa3dd96fa71f59
-rw-r--r--generic.yml10
1 files 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'