gnunet-svn
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taler-exchange] branch master updated (825bd3bd0 -> 5f1567bd7)

From: gnunet
Subject: [taler-exchange] branch master updated (825bd3bd0 -> 5f1567bd7)
Date: Sun, 25 Aug 2024 17:56:11 +0200 
This is an automated email from the git hooks/post-receive script.

devan-carpenter pushed a change to branch master
in repository exchange.

    from 825bd3bd0 -better prepared statement name
     new 7e12f12fe Revert "add job.sh"
     new 830afe1d1 Revert "unify debian packaging logic"
     new 5f1567bd7 CI: unify debian packaging jobs

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 contrib/ci/jobs/000-codespell/job.sh               | 107 ++++++++++++++++++++-
 contrib/ci/jobs/002-test/job.sh                    |   6 +-
 contrib/ci/jobs/003-docs/job.sh                    |   6 +-
 .../100-build-debian-bookworm-amd64-gen/job.sh     |   6 +-
 .../102-upload-debian-bookworm-amd64-gen/job.sh    |  18 +++-
 .../105-build-debian-bookworm-arm64-gen/job.sh     |   6 +-
 .../install-fix.patch                              |  13 ---
 .../job.sh                                         |   1 +
 .../107-upload-debian-bookworm-arm64-gen/job.sh    |  18 +++-
 .../jobs/110-build-debian-trixie-amd64-gen/job.sh  |   6 +-
 .../install-fix.patch                              |  13 ---
 .../111-deb-package-debian-trixie-amd64-gen/job.sh |   1 +
 .../jobs/112-upload-debian-trixie-amd64-gen/job.sh |  18 +++-
 .../jobs/115-build-debian-trixie-arm64-gen/job.sh  |   6 +-
 .../install-fix.patch                              |  13 ---
 .../116-deb-package-debian-trixie-arm64-gen/job.sh |   1 +
 .../jobs/117-upload-debian-trixie-arm64-gen/job.sh |  18 +++-
 .../120-build-debian-unstable-amd64-gen/job.sh     |   6 +-
 .../install-fix.patch                              |  13 ---
 .../job.sh                                         |   1 +
 .../122-upload-debian-unstable-amd64-gen/job.sh    |  18 +++-
 .../125-build-debian-unstable-arm64-gen/job.sh     |   6 +-
 .../install-fix.patch                              |  13 ---
 .../job.sh                                         |   1 +
 .../127-upload-debian-unstable-arm64-gen/job.sh    |  18 +++-
 contrib/ci/targets/debian/build/job.sh             |   6 +-
 contrib/ci/targets/debian/deb-package/job.sh       |  22 +----
 contrib/ci/targets/debian/setup-job.sh             |   2 -
 28 files changed, 259 insertions(+), 104 deletions(-)
 delete mode 100755 
contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-gen/install-fix.patch
 delete mode 100755 
contrib/ci/jobs/111-deb-package-debian-trixie-amd64-gen/install-fix.patch
 delete mode 100755 
contrib/ci/jobs/116-deb-package-debian-trixie-arm64-gen/install-fix.patch
 delete mode 100755 
contrib/ci/jobs/121-deb-package-debian-unstable-amd64-gen/install-fix.patch
 delete mode 100755 
contrib/ci/jobs/126-deb-package-debian-unstable-arm64-gen/install-fix.patch

diff --git a/contrib/ci/jobs/000-codespell/job.sh 
b/contrib/ci/jobs/000-codespell/job.sh
index 3270feb65..5b73aabf3 100755
--- a/contrib/ci/jobs/000-codespell/job.sh
+++ b/contrib/ci/jobs/000-codespell/job.sh
@@ -1,2 +1,107 @@
 #!/bin/bash
-exec ./contrib/ci/debian-package-job.sh
+set -exuo pipefail
+
+job_dir=$(dirname "${BASH_SOURCE[0]}")
+
+skip=$(cat <<EOF
+ABOUT-NLS
+*/afl-tests/*
+**/auditor/*.sql
+**/templating/test-specs/*
+*.bbl
+*.bib
+*build-aux*
+*.bst
+*.cache/*
+*/cbdc-es.tex
+*/cbdc-it.tex
+*.cls
+configure*
+config.status
+config.guess
+./src/include/taler_dbevents.h
+*/contrib/*
+*/contrib/hellos/**
+*.dat
+*.deflate
+*.doc
+*/doc/*
+**/doc/flows/main.de.tex
+*/doc/texinfo.tex
+*.docx
+*.ecc
+*.eot
+*.epgz
+*.eps
+*.epub
+**/ExchangeSelection/example.ts
+*.fee
+*.fees
+*.file
+**/fonts/**
+*.gif
+*/.git/**
+*.gz
+*/i18n/strings.ts
+*.info
+*.jpeg
+*.jpg
+*.??.json
+*.json
+*/keys/*
+*key
+*.latexmkrc
+*libtool*
+*.log
+*/m4/*
+*.m4
+**/*.map
+*.min.js
+*.mp4
+*.odg
+*.ods
+*.odt
+*.pack.js
+*.pdf
+*.png
+*.PNG
+**/pnpm-lock.yaml
+*.po
+*.pptx
+*.priv
+**/rfc.bib
+*.rpath
+**/signing-key.asc
+*.sqlite
+*/src/anastasis-data.ts
+**/*.svg
+*.svg
+*.tag
+**/templating/mustach**
+*/templating/test?/**
+*/testcurl/test_tricky.c
+*/debian/tmp/**
+*/debian/taler-exchange/**
+*/debian/.debhelper/**
+*/debian/autoreconf.before
+*/debian/autoreconf.after
+debian/taler-terms-generator/**/*
+taler-terms-generator
+*.tgz
+*.ttf
+*.ttf
+**/valgrind.h
+*/vpn/tests/**
+*.wav
+*.woff
+*.woff2
+*.xcf
+*.xlsx
+*.zkey
+release-artifacts
+EOF
+);
+
+echo Current directory: `pwd`
+
+codespell -I "${job_dir}"/dictionary.txt -S ${skip//$'\n'/,}
diff --git a/contrib/ci/jobs/002-test/job.sh b/contrib/ci/jobs/002-test/job.sh
index 3270feb65..bfb24e335 100755
--- a/contrib/ci/jobs/002-test/job.sh
+++ b/contrib/ci/jobs/002-test/job.sh
@@ -1,2 +1,6 @@
 #!/bin/bash
-exec ./contrib/ci/debian-package-job.sh
+set -exuo pipefail
+
+job_dir=$(dirname "${BASH_SOURCE[0]}")
+
+"${job_dir}"/test.sh
diff --git a/contrib/ci/jobs/003-docs/job.sh b/contrib/ci/jobs/003-docs/job.sh
index 3270feb65..a72bca4ba 100755
--- a/contrib/ci/jobs/003-docs/job.sh
+++ b/contrib/ci/jobs/003-docs/job.sh
@@ -1,2 +1,6 @@
 #!/bin/bash
-exec ./contrib/ci/debian-package-job.sh
+set -exuo pipefail
+
+job_dir=$(dirname "${BASH_SOURCE[0]}")
+
+"${job_dir}"/docs.sh
diff --git a/contrib/ci/jobs/100-build-debian-bookworm-amd64-gen/job.sh 
b/contrib/ci/jobs/100-build-debian-bookworm-amd64-gen/job.sh
index 3270feb65..8d79902c5 100755
--- a/contrib/ci/jobs/100-build-debian-bookworm-amd64-gen/job.sh
+++ b/contrib/ci/jobs/100-build-debian-bookworm-amd64-gen/job.sh
@@ -1,2 +1,6 @@
 #!/bin/bash
-exec ./contrib/ci/debian-package-job.sh
+set -exuo pipefail
+
+job_dir=$(dirname "${BASH_SOURCE[0]}")
+
+"${job_dir}"/build.sh
diff --git a/contrib/ci/jobs/102-upload-debian-bookworm-amd64-gen/job.sh 
b/contrib/ci/jobs/102-upload-debian-bookworm-amd64-gen/job.sh
index 3270feb65..bc77ef954 100755
--- a/contrib/ci/jobs/102-upload-debian-bookworm-amd64-gen/job.sh
+++ b/contrib/ci/jobs/102-upload-debian-bookworm-amd64-gen/job.sh
@@ -1,2 +1,18 @@
 #!/bin/bash
-exec ./contrib/ci/debian-package-job.sh
+set -exuo pipefail
+
+ARTIFACT_PATH="/artifacts/exchange/${CI_COMMIT_REF}/*.deb"
+RELEASE_ARTIFACT_DIR="${RELEASE_ARTIFACT_DIR:-"$(dirname 
$0)/../../../../release-artifacts"}"
+
+if [[ -d "$RELEASE_ARTIFACT_DIR" ]]; then
+  rsync -vP $ARTIFACT_PATH $RELEASE_ARTIFACT_DIR
+else
+  RSYNC_HOST=${RSYNC_HOST:-"taler.host.internal"}
+  RSYNC_PORT=${RSYNC_PORT:-424242}
+  RSYNC_PATH=${RSYNC_PATH:-"incoming_packages/bookworm-taler-ci/"}
+  RSYNC_DEST=${RSYNC_DEST:-"rsync://${RSYNC_HOST}/${RSYNC_PATH}"}
+
+  rsync -vP \
+    --port ${RSYNC_PORT} \
+    ${ARTIFACT_PATH} ${RSYNC_DEST}
+fi;
diff --git a/contrib/ci/jobs/105-build-debian-bookworm-arm64-gen/job.sh 
b/contrib/ci/jobs/105-build-debian-bookworm-arm64-gen/job.sh
index 3270feb65..8d79902c5 100755
--- a/contrib/ci/jobs/105-build-debian-bookworm-arm64-gen/job.sh
+++ b/contrib/ci/jobs/105-build-debian-bookworm-arm64-gen/job.sh
@@ -1,2 +1,6 @@
 #!/bin/bash
-exec ./contrib/ci/debian-package-job.sh
+set -exuo pipefail
+
+job_dir=$(dirname "${BASH_SOURCE[0]}")
+
+"${job_dir}"/build.sh
diff --git 
a/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-gen/install-fix.patch 
b/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-gen/install-fix.patch
deleted file mode 100755
index 8334c5a7a..000000000
--- 
a/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-gen/install-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/debian/taler-exchange.install b/debian/taler-exchange.install
-index 631c270b..072c6231 100644
---- a/debian/taler-exchange.install
-+++ b/debian/taler-exchange.install
-@@ -36,6 +36,6 @@ usr/share/taler/exchange/templates/*.must
- debian/etc-taler-exchange/* etc/
- 
- # Terms of service / privacy policy templates
--usr/share/taler/exchange/*.rst
-+#usr/share/taler/exchange/terms/*.rst
- # Translations of ToS/PP
--usr/share/taler/exchange/locale/*/LC_MESSAGES/*.po
-+#usr/share/taler/exchange/terms/locale/*/LC_MESSAGES/*.po
diff --git a/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-gen/job.sh 
b/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-gen/job.sh
index 3270feb65..bc767b946 100755
--- a/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-gen/job.sh
+++ b/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-gen/job.sh
@@ -1,2 +1,3 @@
 #!/bin/bash
+
 exec ./contrib/ci/debian-package-job.sh
diff --git a/contrib/ci/jobs/107-upload-debian-bookworm-arm64-gen/job.sh 
b/contrib/ci/jobs/107-upload-debian-bookworm-arm64-gen/job.sh
index 3270feb65..bc77ef954 100755
--- a/contrib/ci/jobs/107-upload-debian-bookworm-arm64-gen/job.sh
+++ b/contrib/ci/jobs/107-upload-debian-bookworm-arm64-gen/job.sh
@@ -1,2 +1,18 @@
 #!/bin/bash
-exec ./contrib/ci/debian-package-job.sh
+set -exuo pipefail
+
+ARTIFACT_PATH="/artifacts/exchange/${CI_COMMIT_REF}/*.deb"
+RELEASE_ARTIFACT_DIR="${RELEASE_ARTIFACT_DIR:-"$(dirname 
$0)/../../../../release-artifacts"}"
+
+if [[ -d "$RELEASE_ARTIFACT_DIR" ]]; then
+  rsync -vP $ARTIFACT_PATH $RELEASE_ARTIFACT_DIR
+else
+  RSYNC_HOST=${RSYNC_HOST:-"taler.host.internal"}
+  RSYNC_PORT=${RSYNC_PORT:-424242}
+  RSYNC_PATH=${RSYNC_PATH:-"incoming_packages/bookworm-taler-ci/"}
+  RSYNC_DEST=${RSYNC_DEST:-"rsync://${RSYNC_HOST}/${RSYNC_PATH}"}
+
+  rsync -vP \
+    --port ${RSYNC_PORT} \
+    ${ARTIFACT_PATH} ${RSYNC_DEST}
+fi;
diff --git a/contrib/ci/jobs/110-build-debian-trixie-amd64-gen/job.sh 
b/contrib/ci/jobs/110-build-debian-trixie-amd64-gen/job.sh
index 3270feb65..8d79902c5 100755
--- a/contrib/ci/jobs/110-build-debian-trixie-amd64-gen/job.sh
+++ b/contrib/ci/jobs/110-build-debian-trixie-amd64-gen/job.sh
@@ -1,2 +1,6 @@
 #!/bin/bash
-exec ./contrib/ci/debian-package-job.sh
+set -exuo pipefail
+
+job_dir=$(dirname "${BASH_SOURCE[0]}")
+
+"${job_dir}"/build.sh
diff --git 
a/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-gen/install-fix.patch 
b/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-gen/install-fix.patch
deleted file mode 100755
index 8334c5a7a..000000000
--- a/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-gen/install-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/debian/taler-exchange.install b/debian/taler-exchange.install
-index 631c270b..072c6231 100644
---- a/debian/taler-exchange.install
-+++ b/debian/taler-exchange.install
-@@ -36,6 +36,6 @@ usr/share/taler/exchange/templates/*.must
- debian/etc-taler-exchange/* etc/
- 
- # Terms of service / privacy policy templates
--usr/share/taler/exchange/*.rst
-+#usr/share/taler/exchange/terms/*.rst
- # Translations of ToS/PP
--usr/share/taler/exchange/locale/*/LC_MESSAGES/*.po
-+#usr/share/taler/exchange/terms/locale/*/LC_MESSAGES/*.po
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 3270feb65..bc767b946 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,2 +1,3 @@
 #!/bin/bash
+
 exec ./contrib/ci/debian-package-job.sh
diff --git a/contrib/ci/jobs/112-upload-debian-trixie-amd64-gen/job.sh 
b/contrib/ci/jobs/112-upload-debian-trixie-amd64-gen/job.sh
index 3270feb65..4793d5bb1 100755
--- a/contrib/ci/jobs/112-upload-debian-trixie-amd64-gen/job.sh
+++ b/contrib/ci/jobs/112-upload-debian-trixie-amd64-gen/job.sh
@@ -1,2 +1,18 @@
 #!/bin/bash
-exec ./contrib/ci/debian-package-job.sh
+set -exuo pipefail
+
+ARTIFACT_PATH="/artifacts/exchange/${CI_COMMIT_REF}/*.deb"
+RELEASE_ARTIFACT_DIR="${RELEASE_ARTIFACT_DIR:-"$(dirname 
$0)/../../../../release-artifacts"}"
+
+if [[ -d "$RELEASE_ARTIFACT_DIR" ]]; then
+  rsync -vP $ARTIFACT_PATH $RELEASE_ARTIFACT_DIR
+else
+  RSYNC_HOST=${RSYNC_HOST:-"taler.host.internal"}
+  RSYNC_PORT=${RSYNC_PORT:-424242}
+  RSYNC_PATH=${RSYNC_PATH:-"incoming_packages/trixie-taler-ci/"}
+  RSYNC_DEST=${RSYNC_DEST:-"rsync://${RSYNC_HOST}/${RSYNC_PATH}"}
+
+  rsync -vP \
+    --port ${RSYNC_PORT} \
+    ${ARTIFACT_PATH} ${RSYNC_DEST}
+fi;
diff --git a/contrib/ci/jobs/115-build-debian-trixie-arm64-gen/job.sh 
b/contrib/ci/jobs/115-build-debian-trixie-arm64-gen/job.sh
index 3270feb65..8d79902c5 100755
--- a/contrib/ci/jobs/115-build-debian-trixie-arm64-gen/job.sh
+++ b/contrib/ci/jobs/115-build-debian-trixie-arm64-gen/job.sh
@@ -1,2 +1,6 @@
 #!/bin/bash
-exec ./contrib/ci/debian-package-job.sh
+set -exuo pipefail
+
+job_dir=$(dirname "${BASH_SOURCE[0]}")
+
+"${job_dir}"/build.sh
diff --git 
a/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-gen/install-fix.patch 
b/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-gen/install-fix.patch
deleted file mode 100755
index 8334c5a7a..000000000
--- a/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-gen/install-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/debian/taler-exchange.install b/debian/taler-exchange.install
-index 631c270b..072c6231 100644
---- a/debian/taler-exchange.install
-+++ b/debian/taler-exchange.install
-@@ -36,6 +36,6 @@ usr/share/taler/exchange/templates/*.must
- debian/etc-taler-exchange/* etc/
- 
- # Terms of service / privacy policy templates
--usr/share/taler/exchange/*.rst
-+#usr/share/taler/exchange/terms/*.rst
- # Translations of ToS/PP
--usr/share/taler/exchange/locale/*/LC_MESSAGES/*.po
-+#usr/share/taler/exchange/terms/locale/*/LC_MESSAGES/*.po
diff --git a/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-gen/job.sh 
b/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-gen/job.sh
index 3270feb65..bc767b946 100755
--- a/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-gen/job.sh
+++ b/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-gen/job.sh
@@ -1,2 +1,3 @@
 #!/bin/bash
+
 exec ./contrib/ci/debian-package-job.sh
diff --git a/contrib/ci/jobs/117-upload-debian-trixie-arm64-gen/job.sh 
b/contrib/ci/jobs/117-upload-debian-trixie-arm64-gen/job.sh
index 3270feb65..4793d5bb1 100755
--- a/contrib/ci/jobs/117-upload-debian-trixie-arm64-gen/job.sh
+++ b/contrib/ci/jobs/117-upload-debian-trixie-arm64-gen/job.sh
@@ -1,2 +1,18 @@
 #!/bin/bash
-exec ./contrib/ci/debian-package-job.sh
+set -exuo pipefail
+
+ARTIFACT_PATH="/artifacts/exchange/${CI_COMMIT_REF}/*.deb"
+RELEASE_ARTIFACT_DIR="${RELEASE_ARTIFACT_DIR:-"$(dirname 
$0)/../../../../release-artifacts"}"
+
+if [[ -d "$RELEASE_ARTIFACT_DIR" ]]; then
+  rsync -vP $ARTIFACT_PATH $RELEASE_ARTIFACT_DIR
+else
+  RSYNC_HOST=${RSYNC_HOST:-"taler.host.internal"}
+  RSYNC_PORT=${RSYNC_PORT:-424242}
+  RSYNC_PATH=${RSYNC_PATH:-"incoming_packages/trixie-taler-ci/"}
+  RSYNC_DEST=${RSYNC_DEST:-"rsync://${RSYNC_HOST}/${RSYNC_PATH}"}
+
+  rsync -vP \
+    --port ${RSYNC_PORT} \
+    ${ARTIFACT_PATH} ${RSYNC_DEST}
+fi;
diff --git a/contrib/ci/jobs/120-build-debian-unstable-amd64-gen/job.sh 
b/contrib/ci/jobs/120-build-debian-unstable-amd64-gen/job.sh
index 3270feb65..8d79902c5 100755
--- a/contrib/ci/jobs/120-build-debian-unstable-amd64-gen/job.sh
+++ b/contrib/ci/jobs/120-build-debian-unstable-amd64-gen/job.sh
@@ -1,2 +1,6 @@
 #!/bin/bash
-exec ./contrib/ci/debian-package-job.sh
+set -exuo pipefail
+
+job_dir=$(dirname "${BASH_SOURCE[0]}")
+
+"${job_dir}"/build.sh
diff --git 
a/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-gen/install-fix.patch 
b/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-gen/install-fix.patch
deleted file mode 100755
index 8334c5a7a..000000000
--- 
a/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-gen/install-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/debian/taler-exchange.install b/debian/taler-exchange.install
-index 631c270b..072c6231 100644
---- a/debian/taler-exchange.install
-+++ b/debian/taler-exchange.install
-@@ -36,6 +36,6 @@ usr/share/taler/exchange/templates/*.must
- debian/etc-taler-exchange/* etc/
- 
- # Terms of service / privacy policy templates
--usr/share/taler/exchange/*.rst
-+#usr/share/taler/exchange/terms/*.rst
- # Translations of ToS/PP
--usr/share/taler/exchange/locale/*/LC_MESSAGES/*.po
-+#usr/share/taler/exchange/terms/locale/*/LC_MESSAGES/*.po
diff --git a/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-gen/job.sh 
b/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-gen/job.sh
index 3270feb65..bc767b946 100755
--- a/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-gen/job.sh
+++ b/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-gen/job.sh
@@ -1,2 +1,3 @@
 #!/bin/bash
+
 exec ./contrib/ci/debian-package-job.sh
diff --git a/contrib/ci/jobs/122-upload-debian-unstable-amd64-gen/job.sh 
b/contrib/ci/jobs/122-upload-debian-unstable-amd64-gen/job.sh
index 3270feb65..ac6c27e56 100755
--- a/contrib/ci/jobs/122-upload-debian-unstable-amd64-gen/job.sh
+++ b/contrib/ci/jobs/122-upload-debian-unstable-amd64-gen/job.sh
@@ -1,2 +1,18 @@
 #!/bin/bash
-exec ./contrib/ci/debian-package-job.sh
+set -exuo pipefail
+
+ARTIFACT_PATH="/artifacts/exchange/${CI_COMMIT_REF}/*.deb"
+RELEASE_ARTIFACT_DIR="${RELEASE_ARTIFACT_DIR:-"$(dirname 
$0)/../../../../release-artifacts"}"
+
+if [[ -d "$RELEASE_ARTIFACT_DIR" ]]; then
+  rsync -vP $ARTIFACT_PATH $RELEASE_ARTIFACT_DIR
+else
+  RSYNC_HOST=${RSYNC_HOST:-"taler.host.internal"}
+  RSYNC_PORT=${RSYNC_PORT:-424242}
+  RSYNC_PATH=${RSYNC_PATH:-"incoming_packages/unstable-taler-ci/"}
+  RSYNC_DEST=${RSYNC_DEST:-"rsync://${RSYNC_HOST}/${RSYNC_PATH}"}
+
+  rsync -vP \
+    --port ${RSYNC_PORT} \
+    ${ARTIFACT_PATH} ${RSYNC_DEST}
+fi;
diff --git a/contrib/ci/jobs/125-build-debian-unstable-arm64-gen/job.sh 
b/contrib/ci/jobs/125-build-debian-unstable-arm64-gen/job.sh
index 3270feb65..8d79902c5 100755
--- a/contrib/ci/jobs/125-build-debian-unstable-arm64-gen/job.sh
+++ b/contrib/ci/jobs/125-build-debian-unstable-arm64-gen/job.sh
@@ -1,2 +1,6 @@
 #!/bin/bash
-exec ./contrib/ci/debian-package-job.sh
+set -exuo pipefail
+
+job_dir=$(dirname "${BASH_SOURCE[0]}")
+
+"${job_dir}"/build.sh
diff --git 
a/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-gen/install-fix.patch 
b/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-gen/install-fix.patch
deleted file mode 100755
index 8334c5a7a..000000000
--- 
a/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-gen/install-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/debian/taler-exchange.install b/debian/taler-exchange.install
-index 631c270b..072c6231 100644
---- a/debian/taler-exchange.install
-+++ b/debian/taler-exchange.install
-@@ -36,6 +36,6 @@ usr/share/taler/exchange/templates/*.must
- debian/etc-taler-exchange/* etc/
- 
- # Terms of service / privacy policy templates
--usr/share/taler/exchange/*.rst
-+#usr/share/taler/exchange/terms/*.rst
- # Translations of ToS/PP
--usr/share/taler/exchange/locale/*/LC_MESSAGES/*.po
-+#usr/share/taler/exchange/terms/locale/*/LC_MESSAGES/*.po
diff --git a/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-gen/job.sh 
b/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-gen/job.sh
index 3270feb65..bc767b946 100755
--- a/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-gen/job.sh
+++ b/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-gen/job.sh
@@ -1,2 +1,3 @@
 #!/bin/bash
+
 exec ./contrib/ci/debian-package-job.sh
diff --git a/contrib/ci/jobs/127-upload-debian-unstable-arm64-gen/job.sh 
b/contrib/ci/jobs/127-upload-debian-unstable-arm64-gen/job.sh
index 3270feb65..ac6c27e56 100755
--- a/contrib/ci/jobs/127-upload-debian-unstable-arm64-gen/job.sh
+++ b/contrib/ci/jobs/127-upload-debian-unstable-arm64-gen/job.sh
@@ -1,2 +1,18 @@
 #!/bin/bash
-exec ./contrib/ci/debian-package-job.sh
+set -exuo pipefail
+
+ARTIFACT_PATH="/artifacts/exchange/${CI_COMMIT_REF}/*.deb"
+RELEASE_ARTIFACT_DIR="${RELEASE_ARTIFACT_DIR:-"$(dirname 
$0)/../../../../release-artifacts"}"
+
+if [[ -d "$RELEASE_ARTIFACT_DIR" ]]; then
+  rsync -vP $ARTIFACT_PATH $RELEASE_ARTIFACT_DIR
+else
+  RSYNC_HOST=${RSYNC_HOST:-"taler.host.internal"}
+  RSYNC_PORT=${RSYNC_PORT:-424242}
+  RSYNC_PATH=${RSYNC_PATH:-"incoming_packages/unstable-taler-ci/"}
+  RSYNC_DEST=${RSYNC_DEST:-"rsync://${RSYNC_HOST}/${RSYNC_PATH}"}
+
+  rsync -vP \
+    --port ${RSYNC_PORT} \
+    ${ARTIFACT_PATH} ${RSYNC_DEST}
+fi;
diff --git a/contrib/ci/targets/debian/build/job.sh 
b/contrib/ci/targets/debian/build/job.sh
index 3270feb65..8d79902c5 100755
--- a/contrib/ci/targets/debian/build/job.sh
+++ b/contrib/ci/targets/debian/build/job.sh
@@ -1,2 +1,6 @@
 #!/bin/bash
-exec ./contrib/ci/debian-package-job.sh
+set -exuo pipefail
+
+job_dir=$(dirname "${BASH_SOURCE[0]}")
+
+"${job_dir}"/build.sh
diff --git a/contrib/ci/targets/debian/deb-package/job.sh 
b/contrib/ci/targets/debian/deb-package/job.sh
index 922f8bf63..bc767b946 100755
--- a/contrib/ci/targets/debian/deb-package/job.sh
+++ b/contrib/ci/targets/debian/deb-package/job.sh
@@ -1,23 +1,3 @@
 #!/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/targets/debian/setup-job.sh 
b/contrib/ci/targets/debian/setup-job.sh
index ad61c3ef1..e43a99e39 100755
--- a/contrib/ci/targets/debian/setup-job.sh
+++ b/contrib/ci/targets/debian/setup-job.sh
@@ -30,9 +30,7 @@ fi;
 # Generate the deb-package target
 cd "${CI_DIR}/jobs/$(mktarget 1 deb-package)"
 sed "1s|FROM .*|FROM ${OCI_IMAGE}|" "$CONTAINERFILE" > Containerfile
-cp "$DISTRO_TARGET/deb-package/version.sh" ./
 cp "$DISTRO_TARGET/deb-package/job.sh" ./
-cp "$DISTRO_TARGET/deb-package/install-fix.patch" ./
 
 if [[ "$ARCH" != "amd64" ]]; then
   echo '[build]

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
reply via email to
[Prev in Thread] Current Thread [Next in Thread]