From 6a7a4aeeffd410659a4972eb78e79827a1313646 Mon Sep 17 00:00:00 2001 From: Hanspeter Portner Date: Mon, 5 Oct 2020 22:54:46 +0200 Subject: [PATCH] gitlab-ci: update recipe to include generic one. --- .gitlab-ci.yml | 68 ++------------------------------------------------ VERSION | 2 +- 2 files changed, 3 insertions(+), 67 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 50d9f39..8fa8402 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,66 +1,2 @@ -stages: - - build - - test - - deploy - -.variables_template: &variables_definition - variables: - BASE_NAME: "canvas_display.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: build - artifacts: - name: "${BASE_NAME}-$(cat VERSION)-${CI_BUILD_NAME}" - paths: - - "${BASE_NAME}-$(cat VERSION)/" - -.build_template: &build_definition - <<: *common_definition - script: - - meson --prefix="/opt/${CI_BUILD_NAME}" --libdir="lib" --cross-file "${CI_BUILD_NAME}" 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 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 - <<: *build_definition - -.arm_linux_template: &arm_linux_definition - image: ventosus/arm-linux-gnueabihf - <<: *build_definition - -# building in docker -x86_64-linux-gnu: - before_script: - - apt-get install -y libglu1-mesa-dev - <<: *universal_linux_definition - -i686-linux-gnu: - before_script: - - apt-get install -y libglu1-mesa-dev:i386 - <<: *universal_linux_definition - -arm-linux-gnueabihf: - before_script: - - apt-get install -y libglu1-mesa-dev:armhf - <<: *arm_linux_definition - -aarch64-linux-gnu: - before_script: - - apt-get install -y libglu1-mesa-dev:arm64 - <<: *arm_linux_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 5abb16f..6a1fb97 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.1.443 +0.1.445 -- 2.38.5