diff options
author | Christian Grothoff <christian@grothoff.org> | 2024-08-19 10:55:07 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2024-08-19 10:55:07 +0200 |
commit | d5bb85938a28be816f3ec7ead1f01a4c88397650 (patch) | |
tree | 148122a6bdf78e949ce88cb44029f8a7cb8185b8 /contrib/ci/jobs/111-deb-package-debian-trixie-amd64-gen | |
parent | 69f1478551e1880ec94a748898fdabe3419a9d90 (diff) | |
download | exchange-d5bb85938a28be816f3ec7ead1f01a4c88397650.tar.xz |
unify debian packaging logic
Diffstat (limited to 'contrib/ci/jobs/111-deb-package-debian-trixie-amd64-gen')
-rwxr-xr-x | contrib/ci/jobs/111-deb-package-debian-trixie-amd64-gen/job.sh | 23 | ||||
-rwxr-xr-x | contrib/ci/jobs/111-deb-package-debian-trixie-amd64-gen/version.sh | 17 |
2 files changed, 1 insertions, 39 deletions
diff --git a/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-gen/job.sh b/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-gen/job.sh index 922f8bf63..3270feb65 100755 --- a/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-gen/job.sh +++ b/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-gen/job.sh @@ -1,23 +1,2 @@ #!/bin/bash -set -exuo pipefail -# This file is in the public domain. -# Helper script to build the latest DEB packages in the container. - - -unset LD_LIBRARY_PATH - -# Install build-time dependencies. -# Update apt cache first -apt-get update -apt-get upgrade -y -mk-build-deps --install --tool='apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends --yes' debian/control - -export VERSION="$(./contrib/ci/jobs/4-deb-package/version.sh)" -echo "Building package version ${VERSION}" -EMAIL=none gbp dch --dch-opt=-b --ignore-branch --debian-tag="%(version)s" --git-author --new-version="${VERSION}" -./bootstrap -dpkg-buildpackage -rfakeroot -b -uc -us - -ls -alh ../*.deb -mkdir -p /artifacts/exchange/${CI_COMMIT_REF} # Variable comes from CI environment -mv ../*.deb /artifacts/exchange/${CI_COMMIT_REF}/ +exec ./contrib/ci/debian-package-job.sh diff --git a/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-gen/version.sh b/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-gen/version.sh deleted file mode 100755 index 52031b23a..000000000 --- a/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-gen/version.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -set -ex - -BRANCH=$(git name-rev --name-only HEAD) -if [ -z "${BRANCH}" ]; then - exit 1 -else - # "Unshallow" our checkout, but only our current branch, and exclude the submodules. - git fetch --no-recurse-submodules --tags --depth=1000 origin "${BRANCH}" - RECENT_VERSION_TAG=$(git describe --tags --match 'v*.*.*' --exclude '*-dev*' --always --abbrev=0 HEAD || exit 1) - commits="$(git rev-list ${RECENT_VERSION_TAG}..HEAD --count)" - if [ "${commits}" = "0" ]; then - git describe --tag HEAD | sed -r 's/^v//' || exit 1 - else - echo $(echo ${RECENT_VERSION_TAG} | sed -r 's/^v//')-${commits}-$(git rev-parse --short=8 HEAD) - fi -fi |