[taler-merchant] branch master updated: unify CI jobs

[gnunet]

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

grothoff pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new 88a599d0 unify CI jobs
88a599d0 is described below

commit 88a599d031dbc559b6a9f5f5c1a5803aa18b86ba
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Mon Aug 19 11:00:03 2024 +0200

    unify CI jobs
---
 .../4-deb-package/job.sh => debian-package-job.sh} |  6 +++---
 contrib/ci/jobs/4-deb-package/job.sh               | 23 +---------------------
 contrib/ci/jobs/7-arm64-deb-package/job.sh         |  3 ++-
 contrib/ci/jobs/7-arm64-deb-package/version.sh     |  1 -
 contrib/ci/{jobs/4-deb-package => }/version.sh     |  3 +++
 5 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/contrib/ci/jobs/4-deb-package/job.sh 
b/contrib/ci/debian-package-job.sh
similarity index 76%
copy from contrib/ci/jobs/4-deb-package/job.sh
copy to contrib/ci/debian-package-job.sh
index a0801b41..a97c3a2a 100755
--- a/contrib/ci/jobs/4-deb-package/job.sh
+++ b/contrib/ci/debian-package-job.sh
@@ -2,7 +2,7 @@
 set -exuo pipefail
 # This file is in the public domain.
 # Helper script to build the latest DEB packages in the container.
-
+# Shared between various jobs.
 
 unset LD_LIBRARY_PATH
 
@@ -12,9 +12,9 @@ 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)"
+export VERSION="$(./contrib/ci/version.sh)"
 echo "Building package version ${VERSION}"
-EMAIL=none gbp dch --ignore-branch --debian-tag="%(version)s" --git-author 
--new-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
 
diff --git a/contrib/ci/jobs/4-deb-package/job.sh 
b/contrib/ci/jobs/4-deb-package/job.sh
old mode 100755
new mode 100644
index a0801b41..3270feb6
--- a/contrib/ci/jobs/4-deb-package/job.sh
+++ b/contrib/ci/jobs/4-deb-package/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 --ignore-branch --debian-tag="%(version)s" --git-author 
--new-version="${VERSION}"
-./bootstrap
-dpkg-buildpackage -rfakeroot -b -uc -us
-
-ls -alh ../*.deb
-mkdir -p /artifacts/merchant/${CI_COMMIT_REF} # Variable comes from CI 
environment
-mv ../*.deb /artifacts/merchant/${CI_COMMIT_REF}/
+exec ./contrib/ci/debian-package-job.sh
diff --git a/contrib/ci/jobs/7-arm64-deb-package/job.sh 
b/contrib/ci/jobs/7-arm64-deb-package/job.sh
deleted file mode 120000
index 333db77e..00000000
--- a/contrib/ci/jobs/7-arm64-deb-package/job.sh
+++ /dev/null
@@ -1 +0,0 @@
-../4-deb-package/job.sh
\ No newline at end of file
diff --git a/contrib/ci/jobs/7-arm64-deb-package/job.sh 
b/contrib/ci/jobs/7-arm64-deb-package/job.sh
new file mode 100644
index 00000000..3270feb6
--- /dev/null
+++ b/contrib/ci/jobs/7-arm64-deb-package/job.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec ./contrib/ci/debian-package-job.sh
diff --git a/contrib/ci/jobs/7-arm64-deb-package/version.sh 
b/contrib/ci/jobs/7-arm64-deb-package/version.sh
deleted file mode 120000
index d67f72c7..00000000
--- a/contrib/ci/jobs/7-arm64-deb-package/version.sh
+++ /dev/null
@@ -1 +0,0 @@
-../4-deb-package/version.sh
\ No newline at end of file
diff --git a/contrib/ci/jobs/4-deb-package/version.sh b/contrib/ci/version.sh
similarity index 84%
rename from contrib/ci/jobs/4-deb-package/version.sh
rename to contrib/ci/version.sh
index 52031b23..e98e5862 100755
--- a/contrib/ci/jobs/4-deb-package/version.sh
+++ b/contrib/ci/version.sh
@@ -1,5 +1,8 @@
 #!/bin/sh
 set -ex
+# This file is in the public domain.
+# Determines the current version of our code.
+# Shared between various jobs.
 
 BRANCH=$(git name-rev --name-only HEAD)
 if [ -z "${BRANCH}" ]; then

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