aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanspeter Portner <dev@open-music-kontrollers.ch>2020-04-08 16:07:01 +0200
committerHanspeter Portner <dev@open-music-kontrollers.ch>2020-04-08 16:07:01 +0200
commit237206a112c4af705e320c7c407668808fef9c69 (patch)
treeb34dc6f14279aa0d80b62ceda2537c5ce54a161e
parent996805ed616d7eab572a4a15cb38321f84aa27d7 (diff)
downloadnuk.lv2-237206a112c4af705e320c7c407668808fef9c69.tar.xz
gitlab-ci: fixes for updated meson.
-rw-r--r--.gitlab-ci.yml80
-rw-r--r--VERSION2
2 files changed, 60 insertions, 22 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 44fab7a..026a52a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,37 +1,51 @@
stages:
- build
- - test
- deploy
.variables_template: &variables_definition
variables:
- BASE_NAME: "nuk.lv2"
PKG_CONFIG_PATH: "/opt/lv2/lib/pkgconfig:/opt/${CI_BUILD_NAME}/lib/pkgconfig:/usr/lib/${CI_BUILD_NAME}/pkgconfig"
+ BUILD_OPTS: ""
.common_template: &common_definition
<<: *variables_definition
stage: build
artifacts:
- name: "${BASE_NAME}-$(cat VERSION)-${CI_BUILD_NAME}"
+ name: "${CI_PROJECT_NAME}-$(cat VERSION)-${CI_BUILD_NAME}"
paths:
- - "${BASE_NAME}-$(cat VERSION)/"
+ - "${CI_PROJECT_NAME}-$(cat VERSION)/${CI_BUILD_NAME}/"
.build_template: &build_definition
<<: *common_definition
script:
- - meson --prefix="/opt/${CI_BUILD_NAME}" --libdir="lib" --cross-file "${CI_BUILD_NAME}" build
+ - meson --prefix="${CI_PROJECT_DIR}/${CI_PROJECT_NAME}-$(cat VERSION)/${CI_BUILD_NAME}" -Dlv2libdir="" --cross-file "${CI_BUILD_NAME}" ${BUILD_OPTS} build
- sed -i -e '/framework/s/-Wl,-O1//g' -e '/framework/s/-Wl,--start-group//g' -e '/framework/s/-Wl,--end-group//g' -e '/framework/s/-Wl,-soname,.*dylib//g' build/build.ninja
- ninja -C build
+ - ninja -C build test
- ninja -C build install
- - mkdir -p "${BASE_NAME}-$(cat VERSION)/${CI_BUILD_NAME}/${BASE_NAME}"
- - cp -r "/opt/${CI_BUILD_NAME}/lib/lv2/${BASE_NAME}/" "${BASE_NAME}-$(cat VERSION)/${CI_BUILD_NAME}/"
-.universal_linux_template: &universal_linux_definition
- image: ventosus/universal-linux-gnu
+.universal_linux_template_stretch: &universal_linux_definition_stretch
+ image: ventosus/universal-linux-gnu:stretch
<<: *build_definition
-.arm_linux_template: &arm_linux_definition
- image: ventosus/arm-linux-gnueabihf
+.universal_linux_template_buster: &universal_linux_definition_buster
+ image: ventosus/universal-linux-gnu:buster
+ <<: *build_definition
+
+.universal_linux_template_bullseye: &universal_linux_definition_bullseye
+ image: ventosus/universal-linux-gnu:bullseye
+ <<: *build_definition
+
+.arm_linux_template_stretch: &arm_linux_definition_stretch
+ image: ventosus/arm-linux-gnueabihf:stretch
+ <<: *build_definition
+
+.arm_linux_template_buster: &arm_linux_definition_buster
+ image: ventosus/arm-linux-gnueabihf:buster
+ <<: *build_definition
+
+.arm_linux_template_bullseye: &arm_linux_definition_bullseye
+ image: ventosus/arm-linux-gnueabihf:bullseye
<<: *build_definition
.universal_w64_template: &universal_w64_definition
@@ -43,17 +57,41 @@ stages:
<<: *build_definition
# building in docker
-x86_64-linux-gnu:
- <<: *universal_linux_definition
+x86_64-linux-gnu-stretch:
+ <<: *universal_linux_definition_stretch
+
+x86_64-linux-gnu-buster:
+ <<: *universal_linux_definition_buster
+
+x86_64-linux-gnu-bullseye:
+ <<: *universal_linux_definition_bullseye
+
+i686-linux-gnu-stretch:
+ <<: *universal_linux_definition_stretch
+
+i686-linux-gnu-buster:
+ <<: *universal_linux_definition_buster
+
+i686-linux-gnu-bullseye:
+ <<: *universal_linux_definition_bullseye
+
+arm-linux-gnueabihf-stretch:
+ <<: *arm_linux_definition_stretch
+
+arm-linux-gnueabihf-buster:
+ <<: *arm_linux_definition_buster
+
+arm-linux-gnueabihf-bullseye:
+ <<: *arm_linux_definition_bullseye
-i686-linux-gnu:
- <<: *universal_linux_definition
+aarch64-linux-gnu-stretch:
+ <<: *arm_linux_definition_stretch
-arm-linux-gnueabihf:
- <<: *arm_linux_definition
+aarch64-linux-gnu-buster:
+ <<: *arm_linux_definition_buster
-aarch64-linux-gnu:
- <<: *arm_linux_definition
+aarch64-linux-gnu-bullseye:
+ <<: *arm_linux_definition_bullseye
x86_64-w64-mingw32:
<<: *universal_w64_definition
@@ -70,6 +108,6 @@ pack:
script:
- echo 'packing up...'
artifacts:
- name: "${BASE_NAME}-$(cat VERSION)"
+ name: "${CI_PROJECT_NAME}-$(cat VERSION)"
paths:
- - "${BASE_NAME}-$(cat VERSION)/"
+ - "${CI_PROJECT_NAME}-$(cat VERSION)/"
diff --git a/VERSION b/VERSION
index 220e31e..1e6058b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.1.2959
+0.1.2961