Merge commit 'ffe956c9aa63c1491e3c607ff080653a634d0450'

3 files changed, 109 insertions, 67 deletions

diff --git a/varchunk/.gitlab-ci.yml b/varchunk/.gitlab-ci.yml
index 24a960c..979769c 100644
--- a/varchunk/.gitlab-ci.yml
+++ b/varchunk/.gitlab-ci.yml
@@ -1,66 +1,2 @@
-stages:
-  - test
-
-.variables_template: &variables_definition
-  variables:
-    BASE_NAME: "varchunk"
-    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/i686-w64-mingw32/lib/libwinpthread-1.dll /opt/i686-w64-mingw32/lib/libwinpthread-1.dll
-    - ln -s /usr/x86_64-w64-mingw32/lib/libwinpthread-1.dll /opt/x86_64-w64-mingw32/lib/libwinpthread-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/varchunk/VERSION b/varchunk/VERSION
index 7c3ae4e..5096aa3 100644
--- a/varchunk/VERSION
+++ b/varchunk/VERSION
@@ -1 +1 @@
-0.1.71
+0.1.89
diff --git a/varchunk/gitlab-ci/generic.yml b/varchunk/gitlab-ci/generic.yml
new file mode 100644
index 0000000..5cd2abc
--- /dev/null
+++ b/varchunk/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)/"