From ea28f2d34f308f812076e0128b1799acf8c686dd Mon Sep 17 00:00:00 2001 From: Nullptrderef Date: Sun, 16 Jun 2024 12:36:06 +0200 Subject: link to common/debian --- contrib/ci/common/build/build.sh | 14 ------------- contrib/ci/common/build/job.sh | 6 ------ contrib/ci/common/deb-package/install-fix.patch | 13 ------------ contrib/ci/common/deb-package/job.sh | 23 ---------------------- contrib/ci/common/deb-package/version.sh | 17 ---------------- contrib/ci/common/debian/build/build.sh | 14 +++++++++++++ contrib/ci/common/debian/build/job.sh | 6 ++++++ .../ci/common/debian/deb-package/install-fix.patch | 13 ++++++++++++ contrib/ci/common/debian/deb-package/job.sh | 23 ++++++++++++++++++++++ contrib/ci/common/debian/deb-package/version.sh | 17 ++++++++++++++++ contrib/ci/jobs/1-build-amd64/build.sh | 2 +- contrib/ci/jobs/1-build-amd64/job.sh | 2 +- .../jobs/10-deb-package-riscv64/install-fix.patch | 2 +- contrib/ci/jobs/10-deb-package-riscv64/job.sh | 2 +- contrib/ci/jobs/10-deb-package-riscv64/version.sh | 2 +- .../ci/jobs/4-deb-package-amd64/install-fix.patch | 2 +- contrib/ci/jobs/4-deb-package-amd64/job.sh | 2 +- contrib/ci/jobs/4-deb-package-amd64/version.sh | 2 +- contrib/ci/jobs/6-build-arm64/build.sh | 2 +- contrib/ci/jobs/6-build-arm64/job.sh | 2 +- .../ci/jobs/7-deb-package-arm64/install-fix.patch | 2 +- contrib/ci/jobs/7-deb-package-arm64/job.sh | 2 +- contrib/ci/jobs/7-deb-package-arm64/version.sh | 2 +- contrib/ci/jobs/9-build-riscv64/build.sh | 2 +- contrib/ci/jobs/9-build-riscv64/job.sh | 2 +- 25 files changed, 88 insertions(+), 88 deletions(-) delete mode 100755 contrib/ci/common/build/build.sh delete mode 100755 contrib/ci/common/build/job.sh delete mode 100644 contrib/ci/common/deb-package/install-fix.patch delete mode 100755 contrib/ci/common/deb-package/job.sh delete mode 100755 contrib/ci/common/deb-package/version.sh create mode 100755 contrib/ci/common/debian/build/build.sh create mode 100755 contrib/ci/common/debian/build/job.sh create mode 100644 contrib/ci/common/debian/deb-package/install-fix.patch create mode 100755 contrib/ci/common/debian/deb-package/job.sh create mode 100755 contrib/ci/common/debian/deb-package/version.sh (limited to 'contrib') diff --git a/contrib/ci/common/build/build.sh b/contrib/ci/common/build/build.sh deleted file mode 100755 index d3fcfab85..000000000 --- a/contrib/ci/common/build/build.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -set -exuo pipefail - -apt-get update -apt-get upgrade -yqq - -./bootstrap -./configure CFLAGS="-ggdb -O0" \ - --enable-logging=verbose \ - --disable-doc - -nump=$(grep processor /proc/cpuinfo | wc -l) -make -j$(( $nump / 2 )) -make diff --git a/contrib/ci/common/build/job.sh b/contrib/ci/common/build/job.sh deleted file mode 100755 index 8d79902c5..000000000 --- a/contrib/ci/common/build/job.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -set -exuo pipefail - -job_dir=$(dirname "${BASH_SOURCE[0]}") - -"${job_dir}"/build.sh diff --git a/contrib/ci/common/deb-package/install-fix.patch b/contrib/ci/common/deb-package/install-fix.patch deleted file mode 100644 index 8334c5a7a..000000000 --- a/contrib/ci/common/deb-package/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/common/deb-package/job.sh b/contrib/ci/common/deb-package/job.sh deleted file mode 100755 index 922f8bf63..000000000 --- a/contrib/ci/common/deb-package/job.sh +++ /dev/null @@ -1,23 +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 -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}/ diff --git a/contrib/ci/common/deb-package/version.sh b/contrib/ci/common/deb-package/version.sh deleted file mode 100755 index 52031b23a..000000000 --- a/contrib/ci/common/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/common/debian/build/build.sh b/contrib/ci/common/debian/build/build.sh new file mode 100755 index 000000000..d3fcfab85 --- /dev/null +++ b/contrib/ci/common/debian/build/build.sh @@ -0,0 +1,14 @@ +#!/bin/bash +set -exuo pipefail + +apt-get update +apt-get upgrade -yqq + +./bootstrap +./configure CFLAGS="-ggdb -O0" \ + --enable-logging=verbose \ + --disable-doc + +nump=$(grep processor /proc/cpuinfo | wc -l) +make -j$(( $nump / 2 )) +make diff --git a/contrib/ci/common/debian/build/job.sh b/contrib/ci/common/debian/build/job.sh new file mode 100755 index 000000000..8d79902c5 --- /dev/null +++ b/contrib/ci/common/debian/build/job.sh @@ -0,0 +1,6 @@ +#!/bin/bash +set -exuo pipefail + +job_dir=$(dirname "${BASH_SOURCE[0]}") + +"${job_dir}"/build.sh diff --git a/contrib/ci/common/debian/deb-package/install-fix.patch b/contrib/ci/common/debian/deb-package/install-fix.patch new file mode 100644 index 000000000..8334c5a7a --- /dev/null +++ b/contrib/ci/common/debian/deb-package/install-fix.patch @@ -0,0 +1,13 @@ +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/common/debian/deb-package/job.sh b/contrib/ci/common/debian/deb-package/job.sh new file mode 100755 index 000000000..922f8bf63 --- /dev/null +++ b/contrib/ci/common/debian/deb-package/job.sh @@ -0,0 +1,23 @@ +#!/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}/ diff --git a/contrib/ci/common/debian/deb-package/version.sh b/contrib/ci/common/debian/deb-package/version.sh new file mode 100755 index 000000000..52031b23a --- /dev/null +++ b/contrib/ci/common/debian/deb-package/version.sh @@ -0,0 +1,17 @@ +#!/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/1-build-amd64/build.sh b/contrib/ci/jobs/1-build-amd64/build.sh index 4c3fda3a5..e8d2a7f97 120000 --- a/contrib/ci/jobs/1-build-amd64/build.sh +++ b/contrib/ci/jobs/1-build-amd64/build.sh @@ -1 +1 @@ -../../common/build/build.sh \ No newline at end of file +../../common/debian/build/build.sh \ No newline at end of file diff --git a/contrib/ci/jobs/1-build-amd64/job.sh b/contrib/ci/jobs/1-build-amd64/job.sh index 0620e044c..a97450993 120000 --- a/contrib/ci/jobs/1-build-amd64/job.sh +++ b/contrib/ci/jobs/1-build-amd64/job.sh @@ -1 +1 @@ -../../common/build/job.sh \ No newline at end of file +../../common/debian/build/job.sh \ No newline at end of file diff --git a/contrib/ci/jobs/10-deb-package-riscv64/install-fix.patch b/contrib/ci/jobs/10-deb-package-riscv64/install-fix.patch index 3b8a8758f..8abc5e3be 120000 --- a/contrib/ci/jobs/10-deb-package-riscv64/install-fix.patch +++ b/contrib/ci/jobs/10-deb-package-riscv64/install-fix.patch @@ -1 +1 @@ -../../common/deb-package/install-fix.patch \ No newline at end of file +../../common/debian/deb-package/install-fix.patch \ No newline at end of file diff --git a/contrib/ci/jobs/10-deb-package-riscv64/job.sh b/contrib/ci/jobs/10-deb-package-riscv64/job.sh index 3301c9cec..905d8a638 120000 --- a/contrib/ci/jobs/10-deb-package-riscv64/job.sh +++ b/contrib/ci/jobs/10-deb-package-riscv64/job.sh @@ -1 +1 @@ -../../common/deb-package/job.sh \ No newline at end of file +../../common/debian/deb-package/job.sh \ No newline at end of file diff --git a/contrib/ci/jobs/10-deb-package-riscv64/version.sh b/contrib/ci/jobs/10-deb-package-riscv64/version.sh index ddea5ae8b..7c51b7217 120000 --- a/contrib/ci/jobs/10-deb-package-riscv64/version.sh +++ b/contrib/ci/jobs/10-deb-package-riscv64/version.sh @@ -1 +1 @@ -../../common/deb-package/version.sh \ No newline at end of file +../../common/debian/deb-package/version.sh \ No newline at end of file diff --git a/contrib/ci/jobs/4-deb-package-amd64/install-fix.patch b/contrib/ci/jobs/4-deb-package-amd64/install-fix.patch index 3b8a8758f..8abc5e3be 120000 --- a/contrib/ci/jobs/4-deb-package-amd64/install-fix.patch +++ b/contrib/ci/jobs/4-deb-package-amd64/install-fix.patch @@ -1 +1 @@ -../../common/deb-package/install-fix.patch \ No newline at end of file +../../common/debian/deb-package/install-fix.patch \ No newline at end of file diff --git a/contrib/ci/jobs/4-deb-package-amd64/job.sh b/contrib/ci/jobs/4-deb-package-amd64/job.sh index 3301c9cec..905d8a638 120000 --- a/contrib/ci/jobs/4-deb-package-amd64/job.sh +++ b/contrib/ci/jobs/4-deb-package-amd64/job.sh @@ -1 +1 @@ -../../common/deb-package/job.sh \ No newline at end of file +../../common/debian/deb-package/job.sh \ No newline at end of file diff --git a/contrib/ci/jobs/4-deb-package-amd64/version.sh b/contrib/ci/jobs/4-deb-package-amd64/version.sh index ddea5ae8b..7c51b7217 120000 --- a/contrib/ci/jobs/4-deb-package-amd64/version.sh +++ b/contrib/ci/jobs/4-deb-package-amd64/version.sh @@ -1 +1 @@ -../../common/deb-package/version.sh \ No newline at end of file +../../common/debian/deb-package/version.sh \ No newline at end of file diff --git a/contrib/ci/jobs/6-build-arm64/build.sh b/contrib/ci/jobs/6-build-arm64/build.sh index 4c3fda3a5..e8d2a7f97 120000 --- a/contrib/ci/jobs/6-build-arm64/build.sh +++ b/contrib/ci/jobs/6-build-arm64/build.sh @@ -1 +1 @@ -../../common/build/build.sh \ No newline at end of file +../../common/debian/build/build.sh \ No newline at end of file diff --git a/contrib/ci/jobs/6-build-arm64/job.sh b/contrib/ci/jobs/6-build-arm64/job.sh index 0620e044c..a97450993 120000 --- a/contrib/ci/jobs/6-build-arm64/job.sh +++ b/contrib/ci/jobs/6-build-arm64/job.sh @@ -1 +1 @@ -../../common/build/job.sh \ No newline at end of file +../../common/debian/build/job.sh \ No newline at end of file diff --git a/contrib/ci/jobs/7-deb-package-arm64/install-fix.patch b/contrib/ci/jobs/7-deb-package-arm64/install-fix.patch index 3b8a8758f..8abc5e3be 120000 --- a/contrib/ci/jobs/7-deb-package-arm64/install-fix.patch +++ b/contrib/ci/jobs/7-deb-package-arm64/install-fix.patch @@ -1 +1 @@ -../../common/deb-package/install-fix.patch \ No newline at end of file +../../common/debian/deb-package/install-fix.patch \ No newline at end of file diff --git a/contrib/ci/jobs/7-deb-package-arm64/job.sh b/contrib/ci/jobs/7-deb-package-arm64/job.sh index 3301c9cec..905d8a638 120000 --- a/contrib/ci/jobs/7-deb-package-arm64/job.sh +++ b/contrib/ci/jobs/7-deb-package-arm64/job.sh @@ -1 +1 @@ -../../common/deb-package/job.sh \ No newline at end of file +../../common/debian/deb-package/job.sh \ No newline at end of file diff --git a/contrib/ci/jobs/7-deb-package-arm64/version.sh b/contrib/ci/jobs/7-deb-package-arm64/version.sh index ddea5ae8b..7c51b7217 120000 --- a/contrib/ci/jobs/7-deb-package-arm64/version.sh +++ b/contrib/ci/jobs/7-deb-package-arm64/version.sh @@ -1 +1 @@ -../../common/deb-package/version.sh \ No newline at end of file +../../common/debian/deb-package/version.sh \ No newline at end of file diff --git a/contrib/ci/jobs/9-build-riscv64/build.sh b/contrib/ci/jobs/9-build-riscv64/build.sh index 4c3fda3a5..e8d2a7f97 120000 --- a/contrib/ci/jobs/9-build-riscv64/build.sh +++ b/contrib/ci/jobs/9-build-riscv64/build.sh @@ -1 +1 @@ -../../common/build/build.sh \ No newline at end of file +../../common/debian/build/build.sh \ No newline at end of file diff --git a/contrib/ci/jobs/9-build-riscv64/job.sh b/contrib/ci/jobs/9-build-riscv64/job.sh index 0620e044c..a97450993 120000 --- a/contrib/ci/jobs/9-build-riscv64/job.sh +++ b/contrib/ci/jobs/9-build-riscv64/job.sh @@ -1 +1 @@ -../../common/build/job.sh \ No newline at end of file +../../common/debian/build/job.sh \ No newline at end of file -- cgit v1.2.3