aboutsummaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorGravatar Hanspeter Portner <dev@open-music-kontrollers.ch>2018-05-18 22:08:43 +0200
committerGravatar Hanspeter Portner <dev@open-music-kontrollers.ch>2018-05-18 22:08:43 +0200
commit1d9048b1d58d976d3d7107a83a65d3c3025018d0 (patch)
tree8b2239c87883ab073ead870c95a6ad3dabc55806 /.gitlab-ci.yml
parentc752593553c2801c50cb2745bce3a44eeb38c3aa (diff)
downloadsynthpod-1d9048b1d58d976d3d7107a83a65d3c3025018d0.zip
synthpod-1d9048b1d58d976d3d7107a83a65d3c3025018d0.tar.gz
synthpod-1d9048b1d58d976d3d7107a83a65d3c3025018d0.tar.bz2
synthpod-1d9048b1d58d976d3d7107a83a65d3c3025018d0.tar.xz
use gitlab CI provided meson toolchain
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml3
1 files changed, 1 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 858acc4..e2f301e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,6 @@ stages:
variables:
BASE_NAME: "synthpod"
PKG_CONFIG_PATH: "/opt/lv2/lib/pkgconfig:/opt/${CI_BUILD_NAME}/lib/pkgconfig:/usr/lib/${CI_BUILD_NAME}/pkgconfig"
- TOOLCHAIN_FILE: "${CI_PROJECT_DIR}/meson/${CI_BUILD_NAME}"
.common_template: &common_definition
<<: *variables_definition
@@ -19,7 +18,7 @@ stages:
.build_template: &build_definition
<<: *common_definition
script:
- - meson --prefix="/" --libdir="lib" --cross-file "${TOOLCHAIN_FILE}" build
+ - meson --prefix="/" --libdir="lib" --cross-file "${CI_BUILD_NAME}" build
- ninja -C build
- DESTDIR="${CI_PROJECT_DIR}/${BASE_NAME}-$(cat VERSION)/${CI_BUILD_NAME}" ninja -C build install