aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanspeter Portner <dev@open-music-kontrollers.ch>2021-01-02 19:10:53 +0100
committerHanspeter Portner <dev@open-music-kontrollers.ch>2021-01-02 19:10:53 +0100
commitaa67e365207ddbcc80a58d5ca826e1f78d4d1e8f (patch)
tree67b678943d5eb36d59339dd9daaca6cd7d82dd62
parent623d21c01ff8990ee9c060508b136c5149ea08dd (diff)
downloadchim.lv2-aa67e365207ddbcc80a58d5ca826e1f78d4d1e8f.tar.xz
Squashed 'osc.lv2/' changes from cca99c9..fe9cf41
fe9cf41 Merge commit '8a1584d3e1053645756367c91ba7faefd4fa4442' into master caa9b1e gitlab-ci: update recipe to include generic one. 8a1584d Squashed 'gitlab-ci/' changes from eeba83f..b03a3c0 050fcb4 gitlab-ci: update recipe to include generic one. 3205d55 Squashed 'gitlab-ci/' content from commit eeba83f b9702be Merge commit '3205d5557a4ba6cb988f50b07ea522c503ce41f4' as 'gitlab-ci' e7f7dc7 gitlab-ci: update recipe to include generic one. 59b6f41 gitlab-ci: remove darwin/mingw targets. git-subtree-dir: osc.lv2 git-subtree-split: fe9cf4156ed844837f4ebbad30680dde929929bf
-rw-r--r--.gitlab-ci.yml67
-rw-r--r--VERSION2
-rw-r--r--gitlab-ci/generic.yml106
3 files changed, 109 insertions, 66 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f0e54dd..979769c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,65 +1,2 @@
-stages:
- - test
-
-.variables_template: &variables_definition
- variables:
- BASE_NAME: "osc.lv2"
- PKG_CONFIG_PATH: "/opt/lv2/lib/pkgconfig:/opt/${CI_BUILD_NAME}/lib/pkgconfig:/usr/lib/${CI_BUILD_NAME}/pkgconfig"
-
-.common_template: &common_definition
- <<: *variables_definition
- stage: test
-
-.build_template: &build_definition
- <<: *common_definition
- script:
- - meson --cross-file "${CI_BUILD_NAME}" build
- - ninja -C build
-
-.test_template: &test_definition
- <<: *common_definition
- script:
- - meson --cross-file "${CI_BUILD_NAME}" build
- - ninja -C build
- - cd build
- - meson test --verbose --wrap "${CI_BUILD_NAME}.wrap"
-
-.universal_linux_template: &universal_linux_definition
- image: ventosus/universal-linux-gnu
- <<: *test_definition
-
-.arm_linux_template: &arm_linux_definition
- image: ventosus/arm-linux-gnueabihf
- <<: *test_definition
-
-.universal_w64_template: &universal_w64_definition
- image: ventosus/universal-w64-mingw32
- before_script:
- - ln -s /usr/lib/gcc/i686-w64-mingw32/6.3-win32/libgcc_s_sjlj-1.dll /opt/i686-w64-mingw32/lib/libgcc_s_sjlj-1.dll
- <<: *test_definition
-
-.universal_apple_template: &universal_apple_definition
- image: ventosus/universal-apple-darwin
- <<: *build_definition
-
-# building in docker
-x86_64-linux-gnu:
- <<: *universal_linux_definition
-
-i686-linux-gnu:
- <<: *universal_linux_definition
-
-arm-linux-gnueabihf:
- <<: *arm_linux_definition
-
-aarch64-linux-gnu:
- <<: *arm_linux_definition
-
-x86_64-w64-mingw32:
- <<: *universal_w64_definition
-
-i686-w64-mingw32:
- <<: *universal_w64_definition
-
-universal-apple-darwin:
- <<: *universal_apple_definition
+include:
+ - local: 'gitlab-ci/generic.yml'
diff --git a/VERSION b/VERSION
index 3170382..c64f02b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.1.143
+0.1.153
diff --git a/gitlab-ci/generic.yml b/gitlab-ci/generic.yml
new file mode 100644
index 0000000..5cd2abc
--- /dev/null
+++ b/gitlab-ci/generic.yml
@@ -0,0 +1,106 @@
+stages:
+ - build
+ - deploy
+
+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
+ 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
+ - ninja -C build
+ - ninja -C build test
+ - ninja -C build install
+
+ - scan-build --status-bugs meson --prefix="${CI_PROJECT_DIR}/${CI_PROJECT_NAME}-$(cat VERSION)/${CI_BUILD_NAME}" -Dlv2libdir="" --cross-file "${CI_BUILD_NAME}" ${BUILD_OPTS} scanbuild
+ - scan-build --status-bugs ninja -C scanbuild
+ - scan-build --status-bugs ninja -C scanbuild test
+ artifacts:
+ name: "${CI_PROJECT_NAME}-$(cat VERSION)-${CI_BUILD_NAME}"
+ paths:
+ - "${CI_PROJECT_NAME}-$(cat VERSION)/${CI_BUILD_NAME}/"
+
+.cross_template: &cross_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
+ - ninja -C build
+ - ninja -C build test
+ - ninja -C build install
+ artifacts:
+ name: "${CI_PROJECT_NAME}-$(cat VERSION)-${CI_BUILD_NAME}"
+ paths:
+ - "${CI_PROJECT_NAME}-$(cat VERSION)/${CI_BUILD_NAME}/"
+
+# build
+.universal_linux_template_stretch: &universal_linux_definition_stretch
+ image: ventosus/universal-linux-gnu:stretch
+ <<: *cross_definition
+
+.universal_linux_template_buster: &universal_linux_definition_buster
+ image: ventosus/universal-linux-gnu:buster
+ <<: *native_definition
+
+.universal_linux_template_bullseye: &universal_linux_definition_bullseye
+ image: ventosus/universal-linux-gnu:bullseye
+ <<: *native_definition
+
+.arm_linux_template_stretch: &arm_linux_definition_stretch
+ image: ventosus/arm-linux-gnueabihf:stretch
+ <<: *cross_definition
+
+.arm_linux_template_buster: &arm_linux_definition_buster
+ image: ventosus/arm-linux-gnueabihf:buster
+ <<: *cross_definition
+
+.arm_linux_template_bullseye: &arm_linux_definition_bullseye
+ image: ventosus/arm-linux-gnueabihf:bullseye
+ <<: *cross_definition
+
+# build
+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
+
+aarch64-linux-gnu-stretch:
+ <<: *arm_linux_definition_stretch
+
+aarch64-linux-gnu-buster:
+ <<: *arm_linux_definition_buster
+
+aarch64-linux-gnu-bullseye:
+ <<: *arm_linux_definition_bullseye
+
+pack:
+ stage: deploy
+ script:
+ - echo 'packing up'
+ artifacts:
+ name: "${CI_PROJECT_NAME}-$(cat VERSION)"
+ paths:
+ - "${CI_PROJECT_NAME}-$(cat VERSION)/"