From 5fef60866c3d598c56e11a0be699787e56a08b50 Mon Sep 17 00:00:00 2001 From: nicoo Date: Wed, 12 Feb 2020 19:16:46 +0100 Subject: Gitlab CI: Use the pipeline from salsa-ci-team --- debian/.gitlab-ci.yml | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/debian/.gitlab-ci.yml b/debian/.gitlab-ci.yml index 76ce17f..33c3a64 100644 --- a/debian/.gitlab-ci.yml +++ b/debian/.gitlab-ci.yml @@ -1,12 +1,4 @@ -image: registry.gitlab.com/eighthave/ci-image-git-buildpackage:latest - -build: - artifacts: - paths: - - "*.deb" - expire_in: 1 day - script: - - gitlab-ci-git-buildpackage-all - except: - variables: - - $CI_COMMIT_TAG != null +--- +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml -- cgit v1.2.3 From a1b73af3812ffee0ad9da739ccf3599e0dbba541 Mon Sep 17 00:00:00 2001 From: nicoo Date: Wed, 12 Feb 2020 19:40:39 +0100 Subject: Make the build deterministic --- debian/control | 2 +- debian/rules | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 686f0dd..9a5dcaa 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Standards-Version: 4.5.0 Build-Depends: debhelper-compat (= 12), pkg-config, - cmake, + cmake (>= 3.14), mandoc, libcbor-dev, libssl-dev, diff --git a/debian/rules b/debian/rules index 9e9bf6a..234840d 100755 --- a/debian/rules +++ b/debian/rules @@ -6,7 +6,8 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all dh $@ override_dh_auto_configure: - dh_auto_configure -- -DUDEV_RULES_DIR=/lib/udev/rules.d + dh_auto_configure -- -DUDEV_RULES_DIR=/lib/udev/rules.d \ + -DCMAKE_BUILD_RPATH_USE_ORIGIN=ON override_dh_missing: dh_missing --fail-missing -- cgit v1.2.3