aboutsummaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorGravatar Hanspeter Portner <dev@open-music-kontrollers.ch>2018-05-18 18:29:31 +0200
committerGravatar Hanspeter Portner <dev@open-music-kontrollers.ch>2018-05-18 18:29:31 +0200
commit5697f8c22d0cd9ebf8e5d3408847cfd69045df2c (patch)
tree1487e38e3ee7b080cef644a2b045b6b64fa0ba04 /.gitlab-ci.yml
parentd148bbaa271ff8ad2ad4d128c6270313ef1aa79f (diff)
downloadvarchunk-5697f8c22d0cd9ebf8e5d3408847cfd69045df2c.zip
varchunk-5697f8c22d0cd9ebf8e5d3408847cfd69045df2c.tar.gz
varchunk-5697f8c22d0cd9ebf8e5d3408847cfd69045df2c.tar.bz2
varchunk-5697f8c22d0cd9ebf8e5d3408847cfd69045df2c.tar.xz
use gitlab CI provided meson cross scripts.
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml5
1 files changed, 2 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0501fcc..d667a47 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,6 @@ stages:
variables:
BASE_NAME: "varchunk"
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
@@ -14,13 +13,13 @@ stages:
.build_template: &build_definition
<<: *common_definition
script:
- - meson --prefix=/ --cross-file "${TOOLCHAIN_FILE}" build
+ - meson --cross-file "${CI_BUILD_NAME}" build
- ninja -C build
.test_template: &test_definition
<<: *common_definition
script:
- - meson --prefix=/ --cross-file "${TOOLCHAIN_FILE}" build
+ - meson --cross-file "${CI_BUILD_NAME}" build
- ninja -C build
- ninja -C build test