diff options
| author | Hanspeter Portner <dev@open-music-kontrollers.ch> | 2020-10-12 23:13:16 +0200 |
|---|---|---|
| committer | Hanspeter Portner <dev@open-music-kontrollers.ch> | 2020-10-12 23:13:16 +0200 |
| commit | 8bb653dee735d8df19fdfd13db224a5a250367a3 (patch) | |
| tree | a94504b35ce8e05022445792b060b8c18c314efa | |
| parent | aaf469f7e88c3da24f601526304a0f632fcf9eaf (diff) | |
| parent | a0da83dff514a97c531adb76bf6e3071108446ef (diff) | |
| download | sherlock.lv2-8bb653dee735d8df19fdfd13db224a5a250367a3.tar.xz | |
Merge commit 'a0da83dff514a97c531adb76bf6e3071108446ef' into master
| -rw-r--r-- | gitlab-ci/generic.yml | 10 |
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' |