diff options
| author | Hanspeter Portner <dev@open-music-kontrollers.ch> | 2020-10-12 23:09:32 +0200 |
|---|---|---|
| committer | Hanspeter Portner <dev@open-music-kontrollers.ch> | 2020-10-12 23:09:32 +0200 |
| commit | 6c09becb65919a6b702e2567efb0409093108bc1 (patch) | |
| tree | 460b0dc9eb7abdcef8f32e50461e5e22603fa2d9 | |
| parent | f9e9a237f0f50ad0f888c244f14b230db5be973d (diff) | |
| parent | 51fa861db694b96e96796e385a6e8ddd8bd891f8 (diff) | |
| download | canvas_display.lv2-6c09becb65919a6b702e2567efb0409093108bc1.tar.xz | |
Merge commit '51fa861db694b96e96796e385a6e8ddd8bd891f8' 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' |