aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanspeter Portner <dev@open-music-kontrollers.ch>2020-10-12 23:14:00 +0200
committerHanspeter Portner <dev@open-music-kontrollers.ch>2020-10-12 23:14:00 +0200
commit0599704d28ad1d059224235415edfa4a97f0e31a (patch)
tree1058d3d21d7732cc1f5d87af997575b158a76a61
parentea66b810a069b6d0cdc60c6d42725303d4a65c53 (diff)
parent4a22473911884c270e4cce8fe08f859b69dc9d95 (diff)
downloadvm.lv2-0599704d28ad1d059224235415edfa4a97f0e31a.tar.xz
Merge commit '4a22473911884c270e4cce8fe08f859b69dc9d95' into master
-rw-r--r--gitlab-ci/generic.yml10
1 files changed, 3 insertions, 7 deletions
diff --git a/gitlab-ci/generic.yml b/gitlab-ci/generic.yml
index aca2fe2..5cd2abc 100644
--- a/gitlab-ci/generic.yml
+++ b/gitlab-ci/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'