diff options
| author | Hanspeter Portner <dev@open-music-kontrollers.ch> | 2020-10-12 23:11:20 +0200 |
|---|---|---|
| committer | Hanspeter Portner <dev@open-music-kontrollers.ch> | 2020-10-12 23:11:20 +0200 |
| commit | 1b44c83406f83bca99773fbefc73c5c73f22521a (patch) | |
| tree | 44ef1760a247c3579cb9cad849b6f5cfa47796c2 | |
| parent | bdd41412a043eada1a05c42addf3db222ee27342 (diff) | |
| parent | 71c55ebcf3ed8244cd35144dde8fd5b8f0fc4f3f (diff) | |
| download | monitors.lv2-1b44c83406f83bca99773fbefc73c5c73f22521a.tar.xz | |
Merge commit '71c55ebcf3ed8244cd35144dde8fd5b8f0fc4f3f' 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' |