[gnunet] 03/16: unify deb-package scripts under ci/common/deb-package

[gnunet]

This is an automated email from the git hooks/post-receive script.

nora-grothoff pushed a commit to branch master
in repository gnunet.

commit ab773df0599b134803469451cfe782d93886bfbc
Author: Nullptrderef <nullptrderef@proton.me>
AuthorDate: Sun Jun 16 09:13:58 2024 +0200

    unify deb-package scripts under ci/common/deb-package
---
 .../deb-package}/job.sh                            |  0
 .../deb-package}/version.sh                        |  0
 contrib/ci/jobs/2-amd64-deb-package/job.sh         | 23 +---------------------
 contrib/ci/jobs/2-amd64-deb-package/version.sh     | 18 +----------------
 contrib/ci/jobs/5-arm64-deb-package/job.sh         | 23 +---------------------
 contrib/ci/jobs/5-arm64-deb-package/version.sh     | 18 +----------------
 6 files changed, 4 insertions(+), 78 deletions(-)

diff --git a/contrib/ci/jobs/2-amd64-deb-package/job.sh 
b/contrib/ci/common/deb-package/job.sh
similarity index 100%
copy from contrib/ci/jobs/2-amd64-deb-package/job.sh
copy to contrib/ci/common/deb-package/job.sh
diff --git a/contrib/ci/jobs/2-amd64-deb-package/version.sh 
b/contrib/ci/common/deb-package/version.sh
similarity index 100%
copy from contrib/ci/jobs/2-amd64-deb-package/version.sh
copy to contrib/ci/common/deb-package/version.sh
diff --git a/contrib/ci/jobs/2-amd64-deb-package/job.sh 
b/contrib/ci/jobs/2-amd64-deb-package/job.sh
deleted file mode 100755
index 00ded9323..000000000
--- a/contrib/ci/jobs/2-amd64-deb-package/job.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/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
-mk-build-deps --install --tool='apt-get -o Debug::pkgProblemResolver=yes 
--no-install-recommends --yes' debian/control
-
-export VERSION="$(./contrib/ci/jobs/2-deb-package/version.sh)"
-echo "Building gnunet packages version ${VERSION}"
-EMAIL=none gbp dch --ignore-branch --debian-tag="%(version)s" --git-author 
--new-version="${VERSION}"
-./bootstrap
-dpkg-buildpackage -rfakeroot -b -uc -us
-
-ls -alh ../*.deb
-mkdir -p /artifacts/gnunet/${CI_COMMIT_REF} # Variable comes from CI 
environment
-mv ../*.deb /artifacts/gnunet/${CI_COMMIT_REF}/
diff --git a/contrib/ci/jobs/2-amd64-deb-package/job.sh 
b/contrib/ci/jobs/2-amd64-deb-package/job.sh
new file mode 120000
index 000000000..3301c9cec
--- /dev/null
+++ b/contrib/ci/jobs/2-amd64-deb-package/job.sh
@@ -0,0 +1 @@
+../../common/deb-package/job.sh
\ No newline at end of file
diff --git a/contrib/ci/jobs/2-amd64-deb-package/version.sh 
b/contrib/ci/jobs/2-amd64-deb-package/version.sh
deleted file mode 100755
index b12ca77ba..000000000
--- a/contrib/ci/jobs/2-amd64-deb-package/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
diff --git a/contrib/ci/jobs/2-amd64-deb-package/version.sh 
b/contrib/ci/jobs/2-amd64-deb-package/version.sh
new file mode 120000
index 000000000..ddea5ae8b
--- /dev/null
+++ b/contrib/ci/jobs/2-amd64-deb-package/version.sh
@@ -0,0 +1 @@
+../../common/deb-package/version.sh
\ No newline at end of file
diff --git a/contrib/ci/jobs/5-arm64-deb-package/job.sh 
b/contrib/ci/jobs/5-arm64-deb-package/job.sh
deleted file mode 100755
index 00ded9323..000000000
--- a/contrib/ci/jobs/5-arm64-deb-package/job.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/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
-mk-build-deps --install --tool='apt-get -o Debug::pkgProblemResolver=yes 
--no-install-recommends --yes' debian/control
-
-export VERSION="$(./contrib/ci/jobs/2-deb-package/version.sh)"
-echo "Building gnunet packages version ${VERSION}"
-EMAIL=none gbp dch --ignore-branch --debian-tag="%(version)s" --git-author 
--new-version="${VERSION}"
-./bootstrap
-dpkg-buildpackage -rfakeroot -b -uc -us
-
-ls -alh ../*.deb
-mkdir -p /artifacts/gnunet/${CI_COMMIT_REF} # Variable comes from CI 
environment
-mv ../*.deb /artifacts/gnunet/${CI_COMMIT_REF}/
diff --git a/contrib/ci/jobs/5-arm64-deb-package/job.sh 
b/contrib/ci/jobs/5-arm64-deb-package/job.sh
new file mode 120000
index 000000000..3301c9cec
--- /dev/null
+++ b/contrib/ci/jobs/5-arm64-deb-package/job.sh
@@ -0,0 +1 @@
+../../common/deb-package/job.sh
\ No newline at end of file
diff --git a/contrib/ci/jobs/5-arm64-deb-package/version.sh 
b/contrib/ci/jobs/5-arm64-deb-package/version.sh
deleted file mode 100755
index b12ca77ba..000000000
--- a/contrib/ci/jobs/5-arm64-deb-package/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
diff --git a/contrib/ci/jobs/5-arm64-deb-package/version.sh 
b/contrib/ci/jobs/5-arm64-deb-package/version.sh
new file mode 120000
index 000000000..ddea5ae8b
--- /dev/null
+++ b/contrib/ci/jobs/5-arm64-deb-package/version.sh
@@ -0,0 +1 @@
+../../common/deb-package/version.sh
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.