From d5703cee5da7189136e19e9662274a0bc9166261 Mon Sep 17 00:00:00 2001 From: Hanspeter Portner Date: Sat, 2 Jan 2021 19:13:46 +0100 Subject: [PATCH] Squashed 'props.lv2/' changes from e23deb0..95d12eb 95d12eb Merge commit '4e50a306d8429b143f19a589c73bd650eeb0f303' into master 9069d9f gitlab-ci: update recipe to include generic one. 4e50a30 Squashed 'gitlab-ci/' changes from eeba83f..b03a3c0 3e33be1 gitlab-ci: update recipe to include generic one. ae5ad37 Squashed 'gitlab-ci/' content from commit eeba83f 3c48efe Merge commit 'ae5ad3754c48892bdd3d49b0dcb9ff4c4224d1d6' as 'gitlab-ci' 4f7d3b9 gitlab-ci: update recipe to include generic one. 8b9b7db gitlab-ci: remove darwin-specific quirks. a234c30 gitlab-ci: remove darwin/mingw targets. git-subtree-dir: props.lv2 git-subtree-split: 95d12eb3b6e466e25a840799541c3942e1553962 --- .gitlab-ci.yml | 77 +----------------------------- VERSION | 2 +- gitlab-ci/generic.yml | 106 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 109 insertions(+), 76 deletions(-) create mode 100644 gitlab-ci/generic.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dd2bcb6..979769c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,75 +1,2 @@ -stages: - - build - - test - - deploy - -.variables_template: &variables_definition - variables: - BASE_NAME: "props.lv2" - PKG_CONFIG_PATH: "/opt/lv2/lib/pkgconfig:/opt/${CI_BUILD_NAME}/lib/pkgconfig" - -.common_template: &common_definition - <<: *variables_definition - stage: build - artifacts: - name: "${BASE_NAME}-$(cat VERSION)-${CI_BUILD_NAME}" - paths: - - "${BASE_NAME}-$(cat VERSION)/" - -.build_template: &build_definition - <<: *common_definition - script: - - mkdir build - - pushd build - - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${CI_PROJECT_DIR} -DPLUGIN_DEST="${BASE_NAME}-$(cat ../VERSION)/${CI_BUILD_NAME}/${BASE_NAME}" -DCMAKE_CI_BUILD_NAME=${CI_BUILD_NAME} .. - - cmake .. # needed for darwin - - make - - make install - -.universal_linux_template: &universal_linux_definition - image: ventosus/universal-linux-gnu - <<: *build_definition - -.arm_linux_template: &arm_linux_definition - image: ventosus/arm-linux-gnueabihf - <<: *build_definition - -.universal_w64_template: &universal_w64_definition - image: ventosus/universal-w64-mingw32 - <<: *build_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 - -pack: - <<: *variables_definition - stage: deploy - script: - - echo 'packing up...' - artifacts: - name: "${BASE_NAME}-$(cat VERSION)" - paths: - - "${BASE_NAME}-$(cat VERSION)/" +include: + - local: 'gitlab-ci/generic.yml' diff --git a/VERSION b/VERSION index eac5392..c64f02b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.1.139 +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)/" -- 2.38.5