From bdec80ec5c04dd551600dd7208594e2aa2b68646 Mon Sep 17 00:00:00 2001 From: Nullptrderef Date: Sun, 16 Jun 2024 16:52:57 +0200 Subject: shorten names --- contrib/ci/generate-jobs | 10 ++-- .../Containerfile | 68 ++++++++++++++++++++++ .../100-build-debian-bookworm-amd64-gen/build.sh | 14 +++++ .../100-build-debian-bookworm-amd64-gen/job.sh | 6 ++ .../Containerfile | 68 ---------------------- .../build.sh | 14 ----- .../job.sh | 6 -- .../Containerfile | 68 ++++++++++++++++++++++ .../install-fix.patch | 13 +++++ .../job.sh | 23 ++++++++ .../version.sh | 17 ++++++ .../Containerfile | 68 ---------------------- .../install-fix.patch | 13 ----- .../job.sh | 23 -------- .../version.sh | 17 ------ .../config.ini | 5 -- .../job.sh | 18 ------ .../config.ini | 5 ++ .../102-upload-debian-bookworm-amd64-gen/job.sh | 18 ++++++ .../Containerfile | 68 ++++++++++++++++++++++ .../105-build-debian-bookworm-arm64-gen/build.sh | 14 +++++ .../105-build-debian-bookworm-arm64-gen/config.ini | 7 +++ .../105-build-debian-bookworm-arm64-gen/job.sh | 6 ++ .../Containerfile | 68 ---------------------- .../build.sh | 14 ----- .../config.ini | 7 --- .../job.sh | 6 -- .../Containerfile | 68 ++++++++++++++++++++++ .../config.ini | 7 +++ .../install-fix.patch | 13 +++++ .../job.sh | 23 ++++++++ .../version.sh | 17 ++++++ .../Containerfile | 68 ---------------------- .../config.ini | 7 --- .../install-fix.patch | 13 ----- .../job.sh | 23 -------- .../version.sh | 17 ------ .../config.ini | 5 -- .../job.sh | 18 ------ .../config.ini | 5 ++ .../107-upload-debian-bookworm-arm64-gen/job.sh | 18 ++++++ .../Containerfile | 68 ++++++++++++++++++++++ .../110-build-debian-trixie-amd64-gen/build.sh | 14 +++++ .../jobs/110-build-debian-trixie-amd64-gen/job.sh | 6 ++ .../Containerfile | 68 ---------------------- .../build.sh | 14 ----- .../110-build-debian-trixie-amd64-generated/job.sh | 6 -- .../Containerfile | 68 ++++++++++++++++++++++ .../install-fix.patch | 13 +++++ .../111-deb-package-debian-trixie-amd64-gen/job.sh | 23 ++++++++ .../version.sh | 17 ++++++ .../Containerfile | 68 ---------------------- .../install-fix.patch | 13 ----- .../job.sh | 23 -------- .../version.sh | 17 ------ .../config.ini | 5 -- .../job.sh | 18 ------ .../112-upload-debian-trixie-amd64-gen/config.ini | 5 ++ .../jobs/112-upload-debian-trixie-amd64-gen/job.sh | 18 ++++++ .../Containerfile | 68 ++++++++++++++++++++++ .../115-build-debian-trixie-arm64-gen/build.sh | 14 +++++ .../115-build-debian-trixie-arm64-gen/config.ini | 7 +++ .../jobs/115-build-debian-trixie-arm64-gen/job.sh | 6 ++ .../Containerfile | 68 ---------------------- .../build.sh | 14 ----- .../config.ini | 7 --- .../115-build-debian-trixie-arm64-generated/job.sh | 6 -- .../Containerfile | 68 ++++++++++++++++++++++ .../config.ini | 7 +++ .../install-fix.patch | 13 +++++ .../116-deb-package-debian-trixie-arm64-gen/job.sh | 23 ++++++++ .../version.sh | 17 ++++++ .../Containerfile | 68 ---------------------- .../config.ini | 7 --- .../install-fix.patch | 13 ----- .../job.sh | 23 -------- .../version.sh | 17 ------ .../config.ini | 5 -- .../job.sh | 18 ------ .../117-upload-debian-trixie-arm64-gen/config.ini | 5 ++ .../jobs/117-upload-debian-trixie-arm64-gen/job.sh | 18 ++++++ .../Containerfile | 68 ++++++++++++++++++++++ .../120-build-debian-unstable-amd64-gen/build.sh | 14 +++++ .../120-build-debian-unstable-amd64-gen/job.sh | 6 ++ .../Containerfile | 68 ---------------------- .../build.sh | 14 ----- .../job.sh | 6 -- .../Containerfile | 68 ++++++++++++++++++++++ .../install-fix.patch | 13 +++++ .../job.sh | 23 ++++++++ .../version.sh | 17 ++++++ .../Containerfile | 68 ---------------------- .../install-fix.patch | 13 ----- .../job.sh | 23 -------- .../version.sh | 17 ------ .../config.ini | 5 -- .../job.sh | 18 ------ .../config.ini | 5 ++ .../122-upload-debian-unstable-amd64-gen/job.sh | 18 ++++++ .../Containerfile | 68 ++++++++++++++++++++++ .../125-build-debian-unstable-arm64-gen/build.sh | 14 +++++ .../125-build-debian-unstable-arm64-gen/config.ini | 7 +++ .../125-build-debian-unstable-arm64-gen/job.sh | 6 ++ .../Containerfile | 68 ---------------------- .../build.sh | 14 ----- .../config.ini | 7 --- .../job.sh | 6 -- .../Containerfile | 68 ++++++++++++++++++++++ .../config.ini | 7 +++ .../install-fix.patch | 13 +++++ .../job.sh | 23 ++++++++ .../version.sh | 17 ++++++ .../Containerfile | 68 ---------------------- .../config.ini | 7 --- .../install-fix.patch | 13 ----- .../job.sh | 23 -------- .../version.sh | 17 ------ .../config.ini | 5 -- .../job.sh | 18 ------ .../config.ini | 5 ++ .../127-upload-debian-unstable-arm64-gen/job.sh | 18 ++++++ .../Containerfile | 68 ++++++++++++++++++++++ .../130-build-debian-unstable-riscv64-gen/build.sh | 14 +++++ .../config.ini | 7 +++ .../130-build-debian-unstable-riscv64-gen/job.sh | 6 ++ .../Containerfile | 68 ---------------------- .../build.sh | 14 ----- .../config.ini | 7 --- .../job.sh | 6 -- .../Containerfile | 68 ++++++++++++++++++++++ .../config.ini | 7 +++ .../install-fix.patch | 13 +++++ .../job.sh | 23 ++++++++ .../version.sh | 17 ++++++ .../Containerfile | 68 ---------------------- .../config.ini | 7 --- .../install-fix.patch | 13 ----- .../job.sh | 23 -------- .../version.sh | 17 ------ .../config.ini | 5 -- .../job.sh | 18 ------ .../config.ini | 5 ++ .../132-upload-debian-unstable-riscv64-gen/job.sh | 18 ++++++ .../ci/targets/debian/deploy-package/config.ini | 5 -- contrib/ci/targets/debian/deploy-package/job.sh | 18 ------ contrib/ci/targets/debian/setup-job.sh | 8 +-- contrib/ci/targets/debian/upload/config.ini | 5 ++ contrib/ci/targets/debian/upload/job.sh | 18 ++++++ 148 files changed, 1712 insertions(+), 1712 deletions(-) create mode 100755 contrib/ci/jobs/100-build-debian-bookworm-amd64-gen/Containerfile create mode 100755 contrib/ci/jobs/100-build-debian-bookworm-amd64-gen/build.sh create mode 100755 contrib/ci/jobs/100-build-debian-bookworm-amd64-gen/job.sh delete mode 100755 contrib/ci/jobs/100-build-debian-bookworm-amd64-generated/Containerfile delete mode 100755 contrib/ci/jobs/100-build-debian-bookworm-amd64-generated/build.sh delete mode 100755 contrib/ci/jobs/100-build-debian-bookworm-amd64-generated/job.sh create mode 100755 contrib/ci/jobs/101-deb-package-debian-bookworm-amd64-gen/Containerfile create mode 100755 contrib/ci/jobs/101-deb-package-debian-bookworm-amd64-gen/install-fix.patch create mode 100755 contrib/ci/jobs/101-deb-package-debian-bookworm-amd64-gen/job.sh create mode 100755 contrib/ci/jobs/101-deb-package-debian-bookworm-amd64-gen/version.sh delete mode 100755 contrib/ci/jobs/101-deb-package-debian-bookworm-amd64-generated/Containerfile delete mode 100755 contrib/ci/jobs/101-deb-package-debian-bookworm-amd64-generated/install-fix.patch delete mode 100755 contrib/ci/jobs/101-deb-package-debian-bookworm-amd64-generated/job.sh delete mode 100755 contrib/ci/jobs/101-deb-package-debian-bookworm-amd64-generated/version.sh delete mode 100755 contrib/ci/jobs/102-deploy-package-debian-bookworm-amd64-generated/config.ini delete mode 100755 contrib/ci/jobs/102-deploy-package-debian-bookworm-amd64-generated/job.sh create mode 100755 contrib/ci/jobs/102-upload-debian-bookworm-amd64-gen/config.ini create mode 100755 contrib/ci/jobs/102-upload-debian-bookworm-amd64-gen/job.sh create mode 100755 contrib/ci/jobs/105-build-debian-bookworm-arm64-gen/Containerfile create mode 100755 contrib/ci/jobs/105-build-debian-bookworm-arm64-gen/build.sh create mode 100755 contrib/ci/jobs/105-build-debian-bookworm-arm64-gen/config.ini create mode 100755 contrib/ci/jobs/105-build-debian-bookworm-arm64-gen/job.sh delete mode 100755 contrib/ci/jobs/105-build-debian-bookworm-arm64-generated/Containerfile delete mode 100755 contrib/ci/jobs/105-build-debian-bookworm-arm64-generated/build.sh delete mode 100755 contrib/ci/jobs/105-build-debian-bookworm-arm64-generated/config.ini delete mode 100755 contrib/ci/jobs/105-build-debian-bookworm-arm64-generated/job.sh create mode 100755 contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-gen/Containerfile create mode 100755 contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-gen/config.ini create mode 100755 contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-gen/install-fix.patch create mode 100755 contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-gen/job.sh create mode 100755 contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-gen/version.sh delete mode 100755 contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-generated/Containerfile delete mode 100755 contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-generated/config.ini delete mode 100755 contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-generated/install-fix.patch delete mode 100755 contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-generated/job.sh delete mode 100755 contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-generated/version.sh delete mode 100755 contrib/ci/jobs/107-deploy-package-debian-bookworm-arm64-generated/config.ini delete mode 100755 contrib/ci/jobs/107-deploy-package-debian-bookworm-arm64-generated/job.sh create mode 100755 contrib/ci/jobs/107-upload-debian-bookworm-arm64-gen/config.ini create mode 100755 contrib/ci/jobs/107-upload-debian-bookworm-arm64-gen/job.sh create mode 100755 contrib/ci/jobs/110-build-debian-trixie-amd64-gen/Containerfile create mode 100755 contrib/ci/jobs/110-build-debian-trixie-amd64-gen/build.sh create mode 100755 contrib/ci/jobs/110-build-debian-trixie-amd64-gen/job.sh delete mode 100755 contrib/ci/jobs/110-build-debian-trixie-amd64-generated/Containerfile delete mode 100755 contrib/ci/jobs/110-build-debian-trixie-amd64-generated/build.sh delete mode 100755 contrib/ci/jobs/110-build-debian-trixie-amd64-generated/job.sh create mode 100755 contrib/ci/jobs/111-deb-package-debian-trixie-amd64-gen/Containerfile create mode 100755 contrib/ci/jobs/111-deb-package-debian-trixie-amd64-gen/install-fix.patch create mode 100755 contrib/ci/jobs/111-deb-package-debian-trixie-amd64-gen/job.sh create mode 100755 contrib/ci/jobs/111-deb-package-debian-trixie-amd64-gen/version.sh delete mode 100755 contrib/ci/jobs/111-deb-package-debian-trixie-amd64-generated/Containerfile delete mode 100755 contrib/ci/jobs/111-deb-package-debian-trixie-amd64-generated/install-fix.patch delete mode 100755 contrib/ci/jobs/111-deb-package-debian-trixie-amd64-generated/job.sh delete mode 100755 contrib/ci/jobs/111-deb-package-debian-trixie-amd64-generated/version.sh delete mode 100755 contrib/ci/jobs/112-deploy-package-debian-trixie-amd64-generated/config.ini delete mode 100755 contrib/ci/jobs/112-deploy-package-debian-trixie-amd64-generated/job.sh create mode 100755 contrib/ci/jobs/112-upload-debian-trixie-amd64-gen/config.ini create mode 100755 contrib/ci/jobs/112-upload-debian-trixie-amd64-gen/job.sh create mode 100755 contrib/ci/jobs/115-build-debian-trixie-arm64-gen/Containerfile create mode 100755 contrib/ci/jobs/115-build-debian-trixie-arm64-gen/build.sh create mode 100755 contrib/ci/jobs/115-build-debian-trixie-arm64-gen/config.ini create mode 100755 contrib/ci/jobs/115-build-debian-trixie-arm64-gen/job.sh delete mode 100755 contrib/ci/jobs/115-build-debian-trixie-arm64-generated/Containerfile delete mode 100755 contrib/ci/jobs/115-build-debian-trixie-arm64-generated/build.sh delete mode 100755 contrib/ci/jobs/115-build-debian-trixie-arm64-generated/config.ini delete mode 100755 contrib/ci/jobs/115-build-debian-trixie-arm64-generated/job.sh create mode 100755 contrib/ci/jobs/116-deb-package-debian-trixie-arm64-gen/Containerfile create mode 100755 contrib/ci/jobs/116-deb-package-debian-trixie-arm64-gen/config.ini create mode 100755 contrib/ci/jobs/116-deb-package-debian-trixie-arm64-gen/install-fix.patch create mode 100755 contrib/ci/jobs/116-deb-package-debian-trixie-arm64-gen/job.sh create mode 100755 contrib/ci/jobs/116-deb-package-debian-trixie-arm64-gen/version.sh delete mode 100755 contrib/ci/jobs/116-deb-package-debian-trixie-arm64-generated/Containerfile delete mode 100755 contrib/ci/jobs/116-deb-package-debian-trixie-arm64-generated/config.ini delete mode 100755 contrib/ci/jobs/116-deb-package-debian-trixie-arm64-generated/install-fix.patch delete mode 100755 contrib/ci/jobs/116-deb-package-debian-trixie-arm64-generated/job.sh delete mode 100755 contrib/ci/jobs/116-deb-package-debian-trixie-arm64-generated/version.sh delete mode 100755 contrib/ci/jobs/117-deploy-package-debian-trixie-arm64-generated/config.ini delete mode 100755 contrib/ci/jobs/117-deploy-package-debian-trixie-arm64-generated/job.sh create mode 100755 contrib/ci/jobs/117-upload-debian-trixie-arm64-gen/config.ini create mode 100755 contrib/ci/jobs/117-upload-debian-trixie-arm64-gen/job.sh create mode 100755 contrib/ci/jobs/120-build-debian-unstable-amd64-gen/Containerfile create mode 100755 contrib/ci/jobs/120-build-debian-unstable-amd64-gen/build.sh create mode 100755 contrib/ci/jobs/120-build-debian-unstable-amd64-gen/job.sh delete mode 100755 contrib/ci/jobs/120-build-debian-unstable-amd64-generated/Containerfile delete mode 100755 contrib/ci/jobs/120-build-debian-unstable-amd64-generated/build.sh delete mode 100755 contrib/ci/jobs/120-build-debian-unstable-amd64-generated/job.sh create mode 100755 contrib/ci/jobs/121-deb-package-debian-unstable-amd64-gen/Containerfile create mode 100755 contrib/ci/jobs/121-deb-package-debian-unstable-amd64-gen/install-fix.patch create mode 100755 contrib/ci/jobs/121-deb-package-debian-unstable-amd64-gen/job.sh create mode 100755 contrib/ci/jobs/121-deb-package-debian-unstable-amd64-gen/version.sh delete mode 100755 contrib/ci/jobs/121-deb-package-debian-unstable-amd64-generated/Containerfile delete mode 100755 contrib/ci/jobs/121-deb-package-debian-unstable-amd64-generated/install-fix.patch delete mode 100755 contrib/ci/jobs/121-deb-package-debian-unstable-amd64-generated/job.sh delete mode 100755 contrib/ci/jobs/121-deb-package-debian-unstable-amd64-generated/version.sh delete mode 100755 contrib/ci/jobs/122-deploy-package-debian-unstable-amd64-generated/config.ini delete mode 100755 contrib/ci/jobs/122-deploy-package-debian-unstable-amd64-generated/job.sh create mode 100755 contrib/ci/jobs/122-upload-debian-unstable-amd64-gen/config.ini create mode 100755 contrib/ci/jobs/122-upload-debian-unstable-amd64-gen/job.sh create mode 100755 contrib/ci/jobs/125-build-debian-unstable-arm64-gen/Containerfile create mode 100755 contrib/ci/jobs/125-build-debian-unstable-arm64-gen/build.sh create mode 100755 contrib/ci/jobs/125-build-debian-unstable-arm64-gen/config.ini create mode 100755 contrib/ci/jobs/125-build-debian-unstable-arm64-gen/job.sh delete mode 100755 contrib/ci/jobs/125-build-debian-unstable-arm64-generated/Containerfile delete mode 100755 contrib/ci/jobs/125-build-debian-unstable-arm64-generated/build.sh delete mode 100755 contrib/ci/jobs/125-build-debian-unstable-arm64-generated/config.ini delete mode 100755 contrib/ci/jobs/125-build-debian-unstable-arm64-generated/job.sh create mode 100755 contrib/ci/jobs/126-deb-package-debian-unstable-arm64-gen/Containerfile create mode 100755 contrib/ci/jobs/126-deb-package-debian-unstable-arm64-gen/config.ini create mode 100755 contrib/ci/jobs/126-deb-package-debian-unstable-arm64-gen/install-fix.patch create mode 100755 contrib/ci/jobs/126-deb-package-debian-unstable-arm64-gen/job.sh create mode 100755 contrib/ci/jobs/126-deb-package-debian-unstable-arm64-gen/version.sh delete mode 100755 contrib/ci/jobs/126-deb-package-debian-unstable-arm64-generated/Containerfile delete mode 100755 contrib/ci/jobs/126-deb-package-debian-unstable-arm64-generated/config.ini delete mode 100755 contrib/ci/jobs/126-deb-package-debian-unstable-arm64-generated/install-fix.patch delete mode 100755 contrib/ci/jobs/126-deb-package-debian-unstable-arm64-generated/job.sh delete mode 100755 contrib/ci/jobs/126-deb-package-debian-unstable-arm64-generated/version.sh delete mode 100755 contrib/ci/jobs/127-deploy-package-debian-unstable-arm64-generated/config.ini delete mode 100755 contrib/ci/jobs/127-deploy-package-debian-unstable-arm64-generated/job.sh create mode 100755 contrib/ci/jobs/127-upload-debian-unstable-arm64-gen/config.ini create mode 100755 contrib/ci/jobs/127-upload-debian-unstable-arm64-gen/job.sh create mode 100755 contrib/ci/jobs/130-build-debian-unstable-riscv64-gen/Containerfile create mode 100755 contrib/ci/jobs/130-build-debian-unstable-riscv64-gen/build.sh create mode 100755 contrib/ci/jobs/130-build-debian-unstable-riscv64-gen/config.ini create mode 100755 contrib/ci/jobs/130-build-debian-unstable-riscv64-gen/job.sh delete mode 100755 contrib/ci/jobs/130-build-debian-unstable-riscv64-generated/Containerfile delete mode 100755 contrib/ci/jobs/130-build-debian-unstable-riscv64-generated/build.sh delete mode 100755 contrib/ci/jobs/130-build-debian-unstable-riscv64-generated/config.ini delete mode 100755 contrib/ci/jobs/130-build-debian-unstable-riscv64-generated/job.sh create mode 100755 contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-gen/Containerfile create mode 100755 contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-gen/config.ini create mode 100755 contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-gen/install-fix.patch create mode 100755 contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-gen/job.sh create mode 100755 contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-gen/version.sh delete mode 100755 contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-generated/Containerfile delete mode 100755 contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-generated/config.ini delete mode 100755 contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-generated/install-fix.patch delete mode 100755 contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-generated/job.sh delete mode 100755 contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-generated/version.sh delete mode 100755 contrib/ci/jobs/132-deploy-package-debian-unstable-riscv64-generated/config.ini delete mode 100755 contrib/ci/jobs/132-deploy-package-debian-unstable-riscv64-generated/job.sh create mode 100755 contrib/ci/jobs/132-upload-debian-unstable-riscv64-gen/config.ini create mode 100755 contrib/ci/jobs/132-upload-debian-unstable-riscv64-gen/job.sh delete mode 100644 contrib/ci/targets/debian/deploy-package/config.ini delete mode 100755 contrib/ci/targets/debian/deploy-package/job.sh create mode 100644 contrib/ci/targets/debian/upload/config.ini create mode 100755 contrib/ci/targets/debian/upload/job.sh (limited to 'contrib/ci') diff --git a/contrib/ci/generate-jobs b/contrib/ci/generate-jobs index 18c11698a..4b1679f62 100755 --- a/contrib/ci/generate-jobs +++ b/contrib/ci/generate-jobs @@ -3,7 +3,7 @@ set -e export CI_DIR="$(pwd)/$(dirname $0)"; -# the number to use as a base for generated ci job indexes +# the number to use as a base for gen ci job indexes BASE_IDX=100; # the amount of indexes to increment - the room a script has to put scripts in. INCREMENT=5; @@ -27,7 +27,7 @@ DISTRO_IMAGES['debian']='docker.io/library/debian'; DISTRO_IMAGES['archlinux']='docker.io/library/archlinux'; chmod +w -R $CI_DIR/jobs; -rm -rf $CI_DIR/jobs/*-generated; +rm -rf $CI_DIR/jobs/*-gen $CI_DIR/jobs/*-generated; TMPBINDIR="/tmp/ci-temp-bin-$RANDOM/" mkdir -p "$TMPBINDIR" @@ -42,7 +42,7 @@ mkfn mktarget '#!/bin/bash RELATIVEIDX=$1 JOBNAME="$2" OURIDX=$(($IDX + $RELATIVEIDX)) -JOB="${OURIDX}-${JOBNAME}-${DISTRO}-${CODENAME}-${ARCH}-generated" +JOB="${OURIDX}-${JOBNAME}-${DISTRO}-${CODENAME}-${ARCH}-gen" cd "$CI_DIR/jobs" mkdir -p "${JOB}" echo -n "${JOB}" @@ -77,5 +77,5 @@ for TARGET in "${BUILD_FOR[@]}"; do done; rm -rf "$TMPBINDIR" -chmod +x -R $CI_DIR/jobs/*-generated -chmod -w -R $CI_DIR/jobs/*-generated +chmod +x -R $CI_DIR/jobs/*-gen +chmod -w -R $CI_DIR/jobs/*-gen diff --git a/contrib/ci/jobs/100-build-debian-bookworm-amd64-gen/Containerfile b/contrib/ci/jobs/100-build-debian-bookworm-amd64-gen/Containerfile new file mode 100755 index 000000000..a7fe8a3ac --- /dev/null +++ b/contrib/ci/jobs/100-build-debian-bookworm-amd64-gen/Containerfile @@ -0,0 +1,68 @@ +FROM docker.io/library/debian:bookworm + +ENV DEBIAN_FRONTEND=noninteractive + +RUN apt-get update -yqq && \ + apt-get install -yqq \ + autoconf \ + autopoint \ + curl \ + bash \ + coreutils \ + git \ + libcurl4-gnutls-dev \ + libgcrypt-dev \ + libidn11-dev \ + libjansson-dev \ + libmicrohttpd-dev \ + libpq-dev \ + libqrencode-dev \ + libsodium-dev \ + libtool \ + libunistring-dev \ + make \ + pkg-config \ + python3-pip \ + python3-sphinx \ + python3-sphinx-rtd-theme \ + recutils \ + texinfo \ + zlib1g-dev \ + # For mustach testing (optional) \ + libjson-c-dev \ + # Debian packaging tools \ + po-debconf \ + build-essential \ + debhelper-compat \ + devscripts \ + git-buildpackage \ + # Documentation dependencies \ + doxygen \ + graphviz \ + pandoc \ + # Test suite dependencies \ + jq \ + postgresql \ + sudo \ + wget + +# Install Taler (and friends) packages +RUN curl -sS https://deb.taler.net/apt-nightly/taler-bookworm-ci.sources \ + | tee /etc/apt/sources.list.d/taler-bookworm-ci.sources + +RUN echo '\ +Package: * \n\ +Pin: origin "deb.taler.net" \n\ +Pin-Priority: 999' > /etc/apt/preferences.d/taler + +RUN cat /etc/apt/preferences.d/taler && \ + apt-get update -y && \ + apt-get install -y \ + libgnunet-dev \ + libgnunet \ + gnunet \ +&& rm -rf /var/lib/apt/lists/* + +WORKDIR /workdir + +CMD ["bash", "/workdir/ci/ci.sh"] diff --git a/contrib/ci/jobs/100-build-debian-bookworm-amd64-gen/build.sh b/contrib/ci/jobs/100-build-debian-bookworm-amd64-gen/build.sh new file mode 100755 index 000000000..d3fcfab85 --- /dev/null +++ b/contrib/ci/jobs/100-build-debian-bookworm-amd64-gen/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/jobs/100-build-debian-bookworm-amd64-gen/job.sh b/contrib/ci/jobs/100-build-debian-bookworm-amd64-gen/job.sh new file mode 100755 index 000000000..8d79902c5 --- /dev/null +++ b/contrib/ci/jobs/100-build-debian-bookworm-amd64-gen/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/jobs/100-build-debian-bookworm-amd64-generated/Containerfile b/contrib/ci/jobs/100-build-debian-bookworm-amd64-generated/Containerfile deleted file mode 100755 index a7fe8a3ac..000000000 --- a/contrib/ci/jobs/100-build-debian-bookworm-amd64-generated/Containerfile +++ /dev/null @@ -1,68 +0,0 @@ -FROM docker.io/library/debian:bookworm - -ENV DEBIAN_FRONTEND=noninteractive - -RUN apt-get update -yqq && \ - apt-get install -yqq \ - autoconf \ - autopoint \ - curl \ - bash \ - coreutils \ - git \ - libcurl4-gnutls-dev \ - libgcrypt-dev \ - libidn11-dev \ - libjansson-dev \ - libmicrohttpd-dev \ - libpq-dev \ - libqrencode-dev \ - libsodium-dev \ - libtool \ - libunistring-dev \ - make \ - pkg-config \ - python3-pip \ - python3-sphinx \ - python3-sphinx-rtd-theme \ - recutils \ - texinfo \ - zlib1g-dev \ - # For mustach testing (optional) \ - libjson-c-dev \ - # Debian packaging tools \ - po-debconf \ - build-essential \ - debhelper-compat \ - devscripts \ - git-buildpackage \ - # Documentation dependencies \ - doxygen \ - graphviz \ - pandoc \ - # Test suite dependencies \ - jq \ - postgresql \ - sudo \ - wget - -# Install Taler (and friends) packages -RUN curl -sS https://deb.taler.net/apt-nightly/taler-bookworm-ci.sources \ - | tee /etc/apt/sources.list.d/taler-bookworm-ci.sources - -RUN echo '\ -Package: * \n\ -Pin: origin "deb.taler.net" \n\ -Pin-Priority: 999' > /etc/apt/preferences.d/taler - -RUN cat /etc/apt/preferences.d/taler && \ - apt-get update -y && \ - apt-get install -y \ - libgnunet-dev \ - libgnunet \ - gnunet \ -&& rm -rf /var/lib/apt/lists/* - -WORKDIR /workdir - -CMD ["bash", "/workdir/ci/ci.sh"] diff --git a/contrib/ci/jobs/100-build-debian-bookworm-amd64-generated/build.sh b/contrib/ci/jobs/100-build-debian-bookworm-amd64-generated/build.sh deleted file mode 100755 index d3fcfab85..000000000 --- a/contrib/ci/jobs/100-build-debian-bookworm-amd64-generated/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/jobs/100-build-debian-bookworm-amd64-generated/job.sh b/contrib/ci/jobs/100-build-debian-bookworm-amd64-generated/job.sh deleted file mode 100755 index 8d79902c5..000000000 --- a/contrib/ci/jobs/100-build-debian-bookworm-amd64-generated/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/jobs/101-deb-package-debian-bookworm-amd64-gen/Containerfile b/contrib/ci/jobs/101-deb-package-debian-bookworm-amd64-gen/Containerfile new file mode 100755 index 000000000..a7fe8a3ac --- /dev/null +++ b/contrib/ci/jobs/101-deb-package-debian-bookworm-amd64-gen/Containerfile @@ -0,0 +1,68 @@ +FROM docker.io/library/debian:bookworm + +ENV DEBIAN_FRONTEND=noninteractive + +RUN apt-get update -yqq && \ + apt-get install -yqq \ + autoconf \ + autopoint \ + curl \ + bash \ + coreutils \ + git \ + libcurl4-gnutls-dev \ + libgcrypt-dev \ + libidn11-dev \ + libjansson-dev \ + libmicrohttpd-dev \ + libpq-dev \ + libqrencode-dev \ + libsodium-dev \ + libtool \ + libunistring-dev \ + make \ + pkg-config \ + python3-pip \ + python3-sphinx \ + python3-sphinx-rtd-theme \ + recutils \ + texinfo \ + zlib1g-dev \ + # For mustach testing (optional) \ + libjson-c-dev \ + # Debian packaging tools \ + po-debconf \ + build-essential \ + debhelper-compat \ + devscripts \ + git-buildpackage \ + # Documentation dependencies \ + doxygen \ + graphviz \ + pandoc \ + # Test suite dependencies \ + jq \ + postgresql \ + sudo \ + wget + +# Install Taler (and friends) packages +RUN curl -sS https://deb.taler.net/apt-nightly/taler-bookworm-ci.sources \ + | tee /etc/apt/sources.list.d/taler-bookworm-ci.sources + +RUN echo '\ +Package: * \n\ +Pin: origin "deb.taler.net" \n\ +Pin-Priority: 999' > /etc/apt/preferences.d/taler + +RUN cat /etc/apt/preferences.d/taler && \ + apt-get update -y && \ + apt-get install -y \ + libgnunet-dev \ + libgnunet \ + gnunet \ +&& rm -rf /var/lib/apt/lists/* + +WORKDIR /workdir + +CMD ["bash", "/workdir/ci/ci.sh"] diff --git a/contrib/ci/jobs/101-deb-package-debian-bookworm-amd64-gen/install-fix.patch b/contrib/ci/jobs/101-deb-package-debian-bookworm-amd64-gen/install-fix.patch new file mode 100755 index 000000000..8334c5a7a --- /dev/null +++ b/contrib/ci/jobs/101-deb-package-debian-bookworm-amd64-gen/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/jobs/101-deb-package-debian-bookworm-amd64-gen/job.sh b/contrib/ci/jobs/101-deb-package-debian-bookworm-amd64-gen/job.sh new file mode 100755 index 000000000..922f8bf63 --- /dev/null +++ b/contrib/ci/jobs/101-deb-package-debian-bookworm-amd64-gen/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/jobs/101-deb-package-debian-bookworm-amd64-gen/version.sh b/contrib/ci/jobs/101-deb-package-debian-bookworm-amd64-gen/version.sh new file mode 100755 index 000000000..52031b23a --- /dev/null +++ b/contrib/ci/jobs/101-deb-package-debian-bookworm-amd64-gen/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/101-deb-package-debian-bookworm-amd64-generated/Containerfile b/contrib/ci/jobs/101-deb-package-debian-bookworm-amd64-generated/Containerfile deleted file mode 100755 index a7fe8a3ac..000000000 --- a/contrib/ci/jobs/101-deb-package-debian-bookworm-amd64-generated/Containerfile +++ /dev/null @@ -1,68 +0,0 @@ -FROM docker.io/library/debian:bookworm - -ENV DEBIAN_FRONTEND=noninteractive - -RUN apt-get update -yqq && \ - apt-get install -yqq \ - autoconf \ - autopoint \ - curl \ - bash \ - coreutils \ - git \ - libcurl4-gnutls-dev \ - libgcrypt-dev \ - libidn11-dev \ - libjansson-dev \ - libmicrohttpd-dev \ - libpq-dev \ - libqrencode-dev \ - libsodium-dev \ - libtool \ - libunistring-dev \ - make \ - pkg-config \ - python3-pip \ - python3-sphinx \ - python3-sphinx-rtd-theme \ - recutils \ - texinfo \ - zlib1g-dev \ - # For mustach testing (optional) \ - libjson-c-dev \ - # Debian packaging tools \ - po-debconf \ - build-essential \ - debhelper-compat \ - devscripts \ - git-buildpackage \ - # Documentation dependencies \ - doxygen \ - graphviz \ - pandoc \ - # Test suite dependencies \ - jq \ - postgresql \ - sudo \ - wget - -# Install Taler (and friends) packages -RUN curl -sS https://deb.taler.net/apt-nightly/taler-bookworm-ci.sources \ - | tee /etc/apt/sources.list.d/taler-bookworm-ci.sources - -RUN echo '\ -Package: * \n\ -Pin: origin "deb.taler.net" \n\ -Pin-Priority: 999' > /etc/apt/preferences.d/taler - -RUN cat /etc/apt/preferences.d/taler && \ - apt-get update -y && \ - apt-get install -y \ - libgnunet-dev \ - libgnunet \ - gnunet \ -&& rm -rf /var/lib/apt/lists/* - -WORKDIR /workdir - -CMD ["bash", "/workdir/ci/ci.sh"] diff --git a/contrib/ci/jobs/101-deb-package-debian-bookworm-amd64-generated/install-fix.patch b/contrib/ci/jobs/101-deb-package-debian-bookworm-amd64-generated/install-fix.patch deleted file mode 100755 index 8334c5a7a..000000000 --- a/contrib/ci/jobs/101-deb-package-debian-bookworm-amd64-generated/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/101-deb-package-debian-bookworm-amd64-generated/job.sh b/contrib/ci/jobs/101-deb-package-debian-bookworm-amd64-generated/job.sh deleted file mode 100755 index 922f8bf63..000000000 --- a/contrib/ci/jobs/101-deb-package-debian-bookworm-amd64-generated/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/jobs/101-deb-package-debian-bookworm-amd64-generated/version.sh b/contrib/ci/jobs/101-deb-package-debian-bookworm-amd64-generated/version.sh deleted file mode 100755 index 52031b23a..000000000 --- a/contrib/ci/jobs/101-deb-package-debian-bookworm-amd64-generated/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/102-deploy-package-debian-bookworm-amd64-generated/config.ini b/contrib/ci/jobs/102-deploy-package-debian-bookworm-amd64-generated/config.ini deleted file mode 100755 index 8d6409a6e..000000000 --- a/contrib/ci/jobs/102-deploy-package-debian-bookworm-amd64-generated/config.ini +++ /dev/null @@ -1,5 +0,0 @@ -[build] -HALT_ON_FAILURE = True -WARN_ON_FAILURE = True -CONTAINER_BUILD = False -CONTAINER_NAME = nixery.dev/shell/rsync diff --git a/contrib/ci/jobs/102-deploy-package-debian-bookworm-amd64-generated/job.sh b/contrib/ci/jobs/102-deploy-package-debian-bookworm-amd64-generated/job.sh deleted file mode 100755 index bc77ef954..000000000 --- a/contrib/ci/jobs/102-deploy-package-debian-bookworm-amd64-generated/job.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -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/102-upload-debian-bookworm-amd64-gen/config.ini b/contrib/ci/jobs/102-upload-debian-bookworm-amd64-gen/config.ini new file mode 100755 index 000000000..8d6409a6e --- /dev/null +++ b/contrib/ci/jobs/102-upload-debian-bookworm-amd64-gen/config.ini @@ -0,0 +1,5 @@ +[build] +HALT_ON_FAILURE = True +WARN_ON_FAILURE = True +CONTAINER_BUILD = False +CONTAINER_NAME = nixery.dev/shell/rsync 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 new file mode 100755 index 000000000..bc77ef954 --- /dev/null +++ b/contrib/ci/jobs/102-upload-debian-bookworm-amd64-gen/job.sh @@ -0,0 +1,18 @@ +#!/bin/bash +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/Containerfile b/contrib/ci/jobs/105-build-debian-bookworm-arm64-gen/Containerfile new file mode 100755 index 000000000..a7fe8a3ac --- /dev/null +++ b/contrib/ci/jobs/105-build-debian-bookworm-arm64-gen/Containerfile @@ -0,0 +1,68 @@ +FROM docker.io/library/debian:bookworm + +ENV DEBIAN_FRONTEND=noninteractive + +RUN apt-get update -yqq && \ + apt-get install -yqq \ + autoconf \ + autopoint \ + curl \ + bash \ + coreutils \ + git \ + libcurl4-gnutls-dev \ + libgcrypt-dev \ + libidn11-dev \ + libjansson-dev \ + libmicrohttpd-dev \ + libpq-dev \ + libqrencode-dev \ + libsodium-dev \ + libtool \ + libunistring-dev \ + make \ + pkg-config \ + python3-pip \ + python3-sphinx \ + python3-sphinx-rtd-theme \ + recutils \ + texinfo \ + zlib1g-dev \ + # For mustach testing (optional) \ + libjson-c-dev \ + # Debian packaging tools \ + po-debconf \ + build-essential \ + debhelper-compat \ + devscripts \ + git-buildpackage \ + # Documentation dependencies \ + doxygen \ + graphviz \ + pandoc \ + # Test suite dependencies \ + jq \ + postgresql \ + sudo \ + wget + +# Install Taler (and friends) packages +RUN curl -sS https://deb.taler.net/apt-nightly/taler-bookworm-ci.sources \ + | tee /etc/apt/sources.list.d/taler-bookworm-ci.sources + +RUN echo '\ +Package: * \n\ +Pin: origin "deb.taler.net" \n\ +Pin-Priority: 999' > /etc/apt/preferences.d/taler + +RUN cat /etc/apt/preferences.d/taler && \ + apt-get update -y && \ + apt-get install -y \ + libgnunet-dev \ + libgnunet \ + gnunet \ +&& rm -rf /var/lib/apt/lists/* + +WORKDIR /workdir + +CMD ["bash", "/workdir/ci/ci.sh"] diff --git a/contrib/ci/jobs/105-build-debian-bookworm-arm64-gen/build.sh b/contrib/ci/jobs/105-build-debian-bookworm-arm64-gen/build.sh new file mode 100755 index 000000000..d3fcfab85 --- /dev/null +++ b/contrib/ci/jobs/105-build-debian-bookworm-arm64-gen/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/jobs/105-build-debian-bookworm-arm64-gen/config.ini b/contrib/ci/jobs/105-build-debian-bookworm-arm64-gen/config.ini new file mode 100755 index 000000000..2a99a970e --- /dev/null +++ b/contrib/ci/jobs/105-build-debian-bookworm-arm64-gen/config.ini @@ -0,0 +1,7 @@ +[build] +HALT_ON_FAILURE = True +WARN_ON_FAILURE = True +CONTAINER_BUILD = True +CONTAINER_NAME = exchange:arm64 +CONTAINER_ARCH = arm64 + 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 new file mode 100755 index 000000000..8d79902c5 --- /dev/null +++ b/contrib/ci/jobs/105-build-debian-bookworm-arm64-gen/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/jobs/105-build-debian-bookworm-arm64-generated/Containerfile b/contrib/ci/jobs/105-build-debian-bookworm-arm64-generated/Containerfile deleted file mode 100755 index a7fe8a3ac..000000000 --- a/contrib/ci/jobs/105-build-debian-bookworm-arm64-generated/Containerfile +++ /dev/null @@ -1,68 +0,0 @@ -FROM docker.io/library/debian:bookworm - -ENV DEBIAN_FRONTEND=noninteractive - -RUN apt-get update -yqq && \ - apt-get install -yqq \ - autoconf \ - autopoint \ - curl \ - bash \ - coreutils \ - git \ - libcurl4-gnutls-dev \ - libgcrypt-dev \ - libidn11-dev \ - libjansson-dev \ - libmicrohttpd-dev \ - libpq-dev \ - libqrencode-dev \ - libsodium-dev \ - libtool \ - libunistring-dev \ - make \ - pkg-config \ - python3-pip \ - python3-sphinx \ - python3-sphinx-rtd-theme \ - recutils \ - texinfo \ - zlib1g-dev \ - # For mustach testing (optional) \ - libjson-c-dev \ - # Debian packaging tools \ - po-debconf \ - build-essential \ - debhelper-compat \ - devscripts \ - git-buildpackage \ - # Documentation dependencies \ - doxygen \ - graphviz \ - pandoc \ - # Test suite dependencies \ - jq \ - postgresql \ - sudo \ - wget - -# Install Taler (and friends) packages -RUN curl -sS https://deb.taler.net/apt-nightly/taler-bookworm-ci.sources \ - | tee /etc/apt/sources.list.d/taler-bookworm-ci.sources - -RUN echo '\ -Package: * \n\ -Pin: origin "deb.taler.net" \n\ -Pin-Priority: 999' > /etc/apt/preferences.d/taler - -RUN cat /etc/apt/preferences.d/taler && \ - apt-get update -y && \ - apt-get install -y \ - libgnunet-dev \ - libgnunet \ - gnunet \ -&& rm -rf /var/lib/apt/lists/* - -WORKDIR /workdir - -CMD ["bash", "/workdir/ci/ci.sh"] diff --git a/contrib/ci/jobs/105-build-debian-bookworm-arm64-generated/build.sh b/contrib/ci/jobs/105-build-debian-bookworm-arm64-generated/build.sh deleted file mode 100755 index d3fcfab85..000000000 --- a/contrib/ci/jobs/105-build-debian-bookworm-arm64-generated/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/jobs/105-build-debian-bookworm-arm64-generated/config.ini b/contrib/ci/jobs/105-build-debian-bookworm-arm64-generated/config.ini deleted file mode 100755 index 2a99a970e..000000000 --- a/contrib/ci/jobs/105-build-debian-bookworm-arm64-generated/config.ini +++ /dev/null @@ -1,7 +0,0 @@ -[build] -HALT_ON_FAILURE = True -WARN_ON_FAILURE = True -CONTAINER_BUILD = True -CONTAINER_NAME = exchange:arm64 -CONTAINER_ARCH = arm64 - diff --git a/contrib/ci/jobs/105-build-debian-bookworm-arm64-generated/job.sh b/contrib/ci/jobs/105-build-debian-bookworm-arm64-generated/job.sh deleted file mode 100755 index 8d79902c5..000000000 --- a/contrib/ci/jobs/105-build-debian-bookworm-arm64-generated/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/jobs/106-deb-package-debian-bookworm-arm64-gen/Containerfile b/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-gen/Containerfile new file mode 100755 index 000000000..a7fe8a3ac --- /dev/null +++ b/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-gen/Containerfile @@ -0,0 +1,68 @@ +FROM docker.io/library/debian:bookworm + +ENV DEBIAN_FRONTEND=noninteractive + +RUN apt-get update -yqq && \ + apt-get install -yqq \ + autoconf \ + autopoint \ + curl \ + bash \ + coreutils \ + git \ + libcurl4-gnutls-dev \ + libgcrypt-dev \ + libidn11-dev \ + libjansson-dev \ + libmicrohttpd-dev \ + libpq-dev \ + libqrencode-dev \ + libsodium-dev \ + libtool \ + libunistring-dev \ + make \ + pkg-config \ + python3-pip \ + python3-sphinx \ + python3-sphinx-rtd-theme \ + recutils \ + texinfo \ + zlib1g-dev \ + # For mustach testing (optional) \ + libjson-c-dev \ + # Debian packaging tools \ + po-debconf \ + build-essential \ + debhelper-compat \ + devscripts \ + git-buildpackage \ + # Documentation dependencies \ + doxygen \ + graphviz \ + pandoc \ + # Test suite dependencies \ + jq \ + postgresql \ + sudo \ + wget + +# Install Taler (and friends) packages +RUN curl -sS https://deb.taler.net/apt-nightly/taler-bookworm-ci.sources \ + | tee /etc/apt/sources.list.d/taler-bookworm-ci.sources + +RUN echo '\ +Package: * \n\ +Pin: origin "deb.taler.net" \n\ +Pin-Priority: 999' > /etc/apt/preferences.d/taler + +RUN cat /etc/apt/preferences.d/taler && \ + apt-get update -y && \ + apt-get install -y \ + libgnunet-dev \ + libgnunet \ + gnunet \ +&& rm -rf /var/lib/apt/lists/* + +WORKDIR /workdir + +CMD ["bash", "/workdir/ci/ci.sh"] diff --git a/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-gen/config.ini b/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-gen/config.ini new file mode 100755 index 000000000..2a99a970e --- /dev/null +++ b/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-gen/config.ini @@ -0,0 +1,7 @@ +[build] +HALT_ON_FAILURE = True +WARN_ON_FAILURE = True +CONTAINER_BUILD = True +CONTAINER_NAME = exchange:arm64 +CONTAINER_ARCH = arm64 + 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 new file mode 100755 index 000000000..8334c5a7a --- /dev/null +++ b/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-gen/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/jobs/106-deb-package-debian-bookworm-arm64-gen/job.sh b/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-gen/job.sh new file mode 100755 index 000000000..922f8bf63 --- /dev/null +++ b/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-gen/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/jobs/106-deb-package-debian-bookworm-arm64-gen/version.sh b/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-gen/version.sh new file mode 100755 index 000000000..52031b23a --- /dev/null +++ b/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-gen/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/106-deb-package-debian-bookworm-arm64-generated/Containerfile b/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-generated/Containerfile deleted file mode 100755 index a7fe8a3ac..000000000 --- a/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-generated/Containerfile +++ /dev/null @@ -1,68 +0,0 @@ -FROM docker.io/library/debian:bookworm - -ENV DEBIAN_FRONTEND=noninteractive - -RUN apt-get update -yqq && \ - apt-get install -yqq \ - autoconf \ - autopoint \ - curl \ - bash \ - coreutils \ - git \ - libcurl4-gnutls-dev \ - libgcrypt-dev \ - libidn11-dev \ - libjansson-dev \ - libmicrohttpd-dev \ - libpq-dev \ - libqrencode-dev \ - libsodium-dev \ - libtool \ - libunistring-dev \ - make \ - pkg-config \ - python3-pip \ - python3-sphinx \ - python3-sphinx-rtd-theme \ - recutils \ - texinfo \ - zlib1g-dev \ - # For mustach testing (optional) \ - libjson-c-dev \ - # Debian packaging tools \ - po-debconf \ - build-essential \ - debhelper-compat \ - devscripts \ - git-buildpackage \ - # Documentation dependencies \ - doxygen \ - graphviz \ - pandoc \ - # Test suite dependencies \ - jq \ - postgresql \ - sudo \ - wget - -# Install Taler (and friends) packages -RUN curl -sS https://deb.taler.net/apt-nightly/taler-bookworm-ci.sources \ - | tee /etc/apt/sources.list.d/taler-bookworm-ci.sources - -RUN echo '\ -Package: * \n\ -Pin: origin "deb.taler.net" \n\ -Pin-Priority: 999' > /etc/apt/preferences.d/taler - -RUN cat /etc/apt/preferences.d/taler && \ - apt-get update -y && \ - apt-get install -y \ - libgnunet-dev \ - libgnunet \ - gnunet \ -&& rm -rf /var/lib/apt/lists/* - -WORKDIR /workdir - -CMD ["bash", "/workdir/ci/ci.sh"] diff --git a/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-generated/config.ini b/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-generated/config.ini deleted file mode 100755 index 2a99a970e..000000000 --- a/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-generated/config.ini +++ /dev/null @@ -1,7 +0,0 @@ -[build] -HALT_ON_FAILURE = True -WARN_ON_FAILURE = True -CONTAINER_BUILD = True -CONTAINER_NAME = exchange:arm64 -CONTAINER_ARCH = arm64 - diff --git a/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-generated/install-fix.patch b/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-generated/install-fix.patch deleted file mode 100755 index 8334c5a7a..000000000 --- a/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-generated/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-generated/job.sh b/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-generated/job.sh deleted file mode 100755 index 922f8bf63..000000000 --- a/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-generated/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/jobs/106-deb-package-debian-bookworm-arm64-generated/version.sh b/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-generated/version.sh deleted file mode 100755 index 52031b23a..000000000 --- a/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-generated/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/107-deploy-package-debian-bookworm-arm64-generated/config.ini b/contrib/ci/jobs/107-deploy-package-debian-bookworm-arm64-generated/config.ini deleted file mode 100755 index 8d6409a6e..000000000 --- a/contrib/ci/jobs/107-deploy-package-debian-bookworm-arm64-generated/config.ini +++ /dev/null @@ -1,5 +0,0 @@ -[build] -HALT_ON_FAILURE = True -WARN_ON_FAILURE = True -CONTAINER_BUILD = False -CONTAINER_NAME = nixery.dev/shell/rsync diff --git a/contrib/ci/jobs/107-deploy-package-debian-bookworm-arm64-generated/job.sh b/contrib/ci/jobs/107-deploy-package-debian-bookworm-arm64-generated/job.sh deleted file mode 100755 index bc77ef954..000000000 --- a/contrib/ci/jobs/107-deploy-package-debian-bookworm-arm64-generated/job.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -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/107-upload-debian-bookworm-arm64-gen/config.ini b/contrib/ci/jobs/107-upload-debian-bookworm-arm64-gen/config.ini new file mode 100755 index 000000000..8d6409a6e --- /dev/null +++ b/contrib/ci/jobs/107-upload-debian-bookworm-arm64-gen/config.ini @@ -0,0 +1,5 @@ +[build] +HALT_ON_FAILURE = True +WARN_ON_FAILURE = True +CONTAINER_BUILD = False +CONTAINER_NAME = nixery.dev/shell/rsync 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 new file mode 100755 index 000000000..bc77ef954 --- /dev/null +++ b/contrib/ci/jobs/107-upload-debian-bookworm-arm64-gen/job.sh @@ -0,0 +1,18 @@ +#!/bin/bash +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/Containerfile b/contrib/ci/jobs/110-build-debian-trixie-amd64-gen/Containerfile new file mode 100755 index 000000000..dc6d84149 --- /dev/null +++ b/contrib/ci/jobs/110-build-debian-trixie-amd64-gen/Containerfile @@ -0,0 +1,68 @@ +FROM docker.io/library/debian:trixie + +ENV DEBIAN_FRONTEND=noninteractive + +RUN apt-get update -yqq && \ + apt-get install -yqq \ + autoconf \ + autopoint \ + curl \ + bash \ + coreutils \ + git \ + libcurl4-gnutls-dev \ + libgcrypt-dev \ + libidn11-dev \ + libjansson-dev \ + libmicrohttpd-dev \ + libpq-dev \ + libqrencode-dev \ + libsodium-dev \ + libtool \ + libunistring-dev \ + make \ + pkg-config \ + python3-pip \ + python3-sphinx \ + python3-sphinx-rtd-theme \ + recutils \ + texinfo \ + zlib1g-dev \ + # For mustach testing (optional) \ + libjson-c-dev \ + # Debian packaging tools \ + po-debconf \ + build-essential \ + debhelper-compat \ + devscripts \ + git-buildpackage \ + # Documentation dependencies \ + doxygen \ + graphviz \ + pandoc \ + # Test suite dependencies \ + jq \ + postgresql \ + sudo \ + wget + +# Install Taler (and friends) packages +RUN curl -sS https://deb.taler.net/apt-nightly/taler-bookworm-ci.sources \ + | tee /etc/apt/sources.list.d/taler-bookworm-ci.sources + +RUN echo '\ +Package: * \n\ +Pin: origin "deb.taler.net" \n\ +Pin-Priority: 999' > /etc/apt/preferences.d/taler + +RUN cat /etc/apt/preferences.d/taler && \ + apt-get update -y && \ + apt-get install -y \ + libgnunet-dev \ + libgnunet \ + gnunet \ +&& rm -rf /var/lib/apt/lists/* + +WORKDIR /workdir + +CMD ["bash", "/workdir/ci/ci.sh"] diff --git a/contrib/ci/jobs/110-build-debian-trixie-amd64-gen/build.sh b/contrib/ci/jobs/110-build-debian-trixie-amd64-gen/build.sh new file mode 100755 index 000000000..d3fcfab85 --- /dev/null +++ b/contrib/ci/jobs/110-build-debian-trixie-amd64-gen/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/jobs/110-build-debian-trixie-amd64-gen/job.sh b/contrib/ci/jobs/110-build-debian-trixie-amd64-gen/job.sh new file mode 100755 index 000000000..8d79902c5 --- /dev/null +++ b/contrib/ci/jobs/110-build-debian-trixie-amd64-gen/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/jobs/110-build-debian-trixie-amd64-generated/Containerfile b/contrib/ci/jobs/110-build-debian-trixie-amd64-generated/Containerfile deleted file mode 100755 index dc6d84149..000000000 --- a/contrib/ci/jobs/110-build-debian-trixie-amd64-generated/Containerfile +++ /dev/null @@ -1,68 +0,0 @@ -FROM docker.io/library/debian:trixie - -ENV DEBIAN_FRONTEND=noninteractive - -RUN apt-get update -yqq && \ - apt-get install -yqq \ - autoconf \ - autopoint \ - curl \ - bash \ - coreutils \ - git \ - libcurl4-gnutls-dev \ - libgcrypt-dev \ - libidn11-dev \ - libjansson-dev \ - libmicrohttpd-dev \ - libpq-dev \ - libqrencode-dev \ - libsodium-dev \ - libtool \ - libunistring-dev \ - make \ - pkg-config \ - python3-pip \ - python3-sphinx \ - python3-sphinx-rtd-theme \ - recutils \ - texinfo \ - zlib1g-dev \ - # For mustach testing (optional) \ - libjson-c-dev \ - # Debian packaging tools \ - po-debconf \ - build-essential \ - debhelper-compat \ - devscripts \ - git-buildpackage \ - # Documentation dependencies \ - doxygen \ - graphviz \ - pandoc \ - # Test suite dependencies \ - jq \ - postgresql \ - sudo \ - wget - -# Install Taler (and friends) packages -RUN curl -sS https://deb.taler.net/apt-nightly/taler-bookworm-ci.sources \ - | tee /etc/apt/sources.list.d/taler-bookworm-ci.sources - -RUN echo '\ -Package: * \n\ -Pin: origin "deb.taler.net" \n\ -Pin-Priority: 999' > /etc/apt/preferences.d/taler - -RUN cat /etc/apt/preferences.d/taler && \ - apt-get update -y && \ - apt-get install -y \ - libgnunet-dev \ - libgnunet \ - gnunet \ -&& rm -rf /var/lib/apt/lists/* - -WORKDIR /workdir - -CMD ["bash", "/workdir/ci/ci.sh"] diff --git a/contrib/ci/jobs/110-build-debian-trixie-amd64-generated/build.sh b/contrib/ci/jobs/110-build-debian-trixie-amd64-generated/build.sh deleted file mode 100755 index d3fcfab85..000000000 --- a/contrib/ci/jobs/110-build-debian-trixie-amd64-generated/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/jobs/110-build-debian-trixie-amd64-generated/job.sh b/contrib/ci/jobs/110-build-debian-trixie-amd64-generated/job.sh deleted file mode 100755 index 8d79902c5..000000000 --- a/contrib/ci/jobs/110-build-debian-trixie-amd64-generated/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/jobs/111-deb-package-debian-trixie-amd64-gen/Containerfile b/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-gen/Containerfile new file mode 100755 index 000000000..dc6d84149 --- /dev/null +++ b/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-gen/Containerfile @@ -0,0 +1,68 @@ +FROM docker.io/library/debian:trixie + +ENV DEBIAN_FRONTEND=noninteractive + +RUN apt-get update -yqq && \ + apt-get install -yqq \ + autoconf \ + autopoint \ + curl \ + bash \ + coreutils \ + git \ + libcurl4-gnutls-dev \ + libgcrypt-dev \ + libidn11-dev \ + libjansson-dev \ + libmicrohttpd-dev \ + libpq-dev \ + libqrencode-dev \ + libsodium-dev \ + libtool \ + libunistring-dev \ + make \ + pkg-config \ + python3-pip \ + python3-sphinx \ + python3-sphinx-rtd-theme \ + recutils \ + texinfo \ + zlib1g-dev \ + # For mustach testing (optional) \ + libjson-c-dev \ + # Debian packaging tools \ + po-debconf \ + build-essential \ + debhelper-compat \ + devscripts \ + git-buildpackage \ + # Documentation dependencies \ + doxygen \ + graphviz \ + pandoc \ + # Test suite dependencies \ + jq \ + postgresql \ + sudo \ + wget + +# Install Taler (and friends) packages +RUN curl -sS https://deb.taler.net/apt-nightly/taler-bookworm-ci.sources \ + | tee /etc/apt/sources.list.d/taler-bookworm-ci.sources + +RUN echo '\ +Package: * \n\ +Pin: origin "deb.taler.net" \n\ +Pin-Priority: 999' > /etc/apt/preferences.d/taler + +RUN cat /etc/apt/preferences.d/taler && \ + apt-get update -y && \ + apt-get install -y \ + libgnunet-dev \ + libgnunet \ + gnunet \ +&& rm -rf /var/lib/apt/lists/* + +WORKDIR /workdir + +CMD ["bash", "/workdir/ci/ci.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 new file mode 100755 index 000000000..8334c5a7a --- /dev/null +++ b/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-gen/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/jobs/111-deb-package-debian-trixie-amd64-gen/job.sh b/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-gen/job.sh new file mode 100755 index 000000000..922f8bf63 --- /dev/null +++ b/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-gen/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/jobs/111-deb-package-debian-trixie-amd64-gen/version.sh b/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-gen/version.sh new file mode 100755 index 000000000..52031b23a --- /dev/null +++ b/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-gen/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/111-deb-package-debian-trixie-amd64-generated/Containerfile b/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-generated/Containerfile deleted file mode 100755 index dc6d84149..000000000 --- a/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-generated/Containerfile +++ /dev/null @@ -1,68 +0,0 @@ -FROM docker.io/library/debian:trixie - -ENV DEBIAN_FRONTEND=noninteractive - -RUN apt-get update -yqq && \ - apt-get install -yqq \ - autoconf \ - autopoint \ - curl \ - bash \ - coreutils \ - git \ - libcurl4-gnutls-dev \ - libgcrypt-dev \ - libidn11-dev \ - libjansson-dev \ - libmicrohttpd-dev \ - libpq-dev \ - libqrencode-dev \ - libsodium-dev \ - libtool \ - libunistring-dev \ - make \ - pkg-config \ - python3-pip \ - python3-sphinx \ - python3-sphinx-rtd-theme \ - recutils \ - texinfo \ - zlib1g-dev \ - # For mustach testing (optional) \ - libjson-c-dev \ - # Debian packaging tools \ - po-debconf \ - build-essential \ - debhelper-compat \ - devscripts \ - git-buildpackage \ - # Documentation dependencies \ - doxygen \ - graphviz \ - pandoc \ - # Test suite dependencies \ - jq \ - postgresql \ - sudo \ - wget - -# Install Taler (and friends) packages -RUN curl -sS https://deb.taler.net/apt-nightly/taler-bookworm-ci.sources \ - | tee /etc/apt/sources.list.d/taler-bookworm-ci.sources - -RUN echo '\ -Package: * \n\ -Pin: origin "deb.taler.net" \n\ -Pin-Priority: 999' > /etc/apt/preferences.d/taler - -RUN cat /etc/apt/preferences.d/taler && \ - apt-get update -y && \ - apt-get install -y \ - libgnunet-dev \ - libgnunet \ - gnunet \ -&& rm -rf /var/lib/apt/lists/* - -WORKDIR /workdir - -CMD ["bash", "/workdir/ci/ci.sh"] diff --git a/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-generated/install-fix.patch b/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-generated/install-fix.patch deleted file mode 100755 index 8334c5a7a..000000000 --- a/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-generated/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-generated/job.sh b/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-generated/job.sh deleted file mode 100755 index 922f8bf63..000000000 --- a/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-generated/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/jobs/111-deb-package-debian-trixie-amd64-generated/version.sh b/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-generated/version.sh deleted file mode 100755 index 52031b23a..000000000 --- a/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-generated/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/112-deploy-package-debian-trixie-amd64-generated/config.ini b/contrib/ci/jobs/112-deploy-package-debian-trixie-amd64-generated/config.ini deleted file mode 100755 index 8d6409a6e..000000000 --- a/contrib/ci/jobs/112-deploy-package-debian-trixie-amd64-generated/config.ini +++ /dev/null @@ -1,5 +0,0 @@ -[build] -HALT_ON_FAILURE = True -WARN_ON_FAILURE = True -CONTAINER_BUILD = False -CONTAINER_NAME = nixery.dev/shell/rsync diff --git a/contrib/ci/jobs/112-deploy-package-debian-trixie-amd64-generated/job.sh b/contrib/ci/jobs/112-deploy-package-debian-trixie-amd64-generated/job.sh deleted file mode 100755 index 4793d5bb1..000000000 --- a/contrib/ci/jobs/112-deploy-package-debian-trixie-amd64-generated/job.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -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/112-upload-debian-trixie-amd64-gen/config.ini b/contrib/ci/jobs/112-upload-debian-trixie-amd64-gen/config.ini new file mode 100755 index 000000000..8d6409a6e --- /dev/null +++ b/contrib/ci/jobs/112-upload-debian-trixie-amd64-gen/config.ini @@ -0,0 +1,5 @@ +[build] +HALT_ON_FAILURE = True +WARN_ON_FAILURE = True +CONTAINER_BUILD = False +CONTAINER_NAME = nixery.dev/shell/rsync 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 new file mode 100755 index 000000000..4793d5bb1 --- /dev/null +++ b/contrib/ci/jobs/112-upload-debian-trixie-amd64-gen/job.sh @@ -0,0 +1,18 @@ +#!/bin/bash +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/Containerfile b/contrib/ci/jobs/115-build-debian-trixie-arm64-gen/Containerfile new file mode 100755 index 000000000..dc6d84149 --- /dev/null +++ b/contrib/ci/jobs/115-build-debian-trixie-arm64-gen/Containerfile @@ -0,0 +1,68 @@ +FROM docker.io/library/debian:trixie + +ENV DEBIAN_FRONTEND=noninteractive + +RUN apt-get update -yqq && \ + apt-get install -yqq \ + autoconf \ + autopoint \ + curl \ + bash \ + coreutils \ + git \ + libcurl4-gnutls-dev \ + libgcrypt-dev \ + libidn11-dev \ + libjansson-dev \ + libmicrohttpd-dev \ + libpq-dev \ + libqrencode-dev \ + libsodium-dev \ + libtool \ + libunistring-dev \ + make \ + pkg-config \ + python3-pip \ + python3-sphinx \ + python3-sphinx-rtd-theme \ + recutils \ + texinfo \ + zlib1g-dev \ + # For mustach testing (optional) \ + libjson-c-dev \ + # Debian packaging tools \ + po-debconf \ + build-essential \ + debhelper-compat \ + devscripts \ + git-buildpackage \ + # Documentation dependencies \ + doxygen \ + graphviz \ + pandoc \ + # Test suite dependencies \ + jq \ + postgresql \ + sudo \ + wget + +# Install Taler (and friends) packages +RUN curl -sS https://deb.taler.net/apt-nightly/taler-bookworm-ci.sources \ + | tee /etc/apt/sources.list.d/taler-bookworm-ci.sources + +RUN echo '\ +Package: * \n\ +Pin: origin "deb.taler.net" \n\ +Pin-Priority: 999' > /etc/apt/preferences.d/taler + +RUN cat /etc/apt/preferences.d/taler && \ + apt-get update -y && \ + apt-get install -y \ + libgnunet-dev \ + libgnunet \ + gnunet \ +&& rm -rf /var/lib/apt/lists/* + +WORKDIR /workdir + +CMD ["bash", "/workdir/ci/ci.sh"] diff --git a/contrib/ci/jobs/115-build-debian-trixie-arm64-gen/build.sh b/contrib/ci/jobs/115-build-debian-trixie-arm64-gen/build.sh new file mode 100755 index 000000000..d3fcfab85 --- /dev/null +++ b/contrib/ci/jobs/115-build-debian-trixie-arm64-gen/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/jobs/115-build-debian-trixie-arm64-gen/config.ini b/contrib/ci/jobs/115-build-debian-trixie-arm64-gen/config.ini new file mode 100755 index 000000000..2a99a970e --- /dev/null +++ b/contrib/ci/jobs/115-build-debian-trixie-arm64-gen/config.ini @@ -0,0 +1,7 @@ +[build] +HALT_ON_FAILURE = True +WARN_ON_FAILURE = True +CONTAINER_BUILD = True +CONTAINER_NAME = exchange:arm64 +CONTAINER_ARCH = arm64 + 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 new file mode 100755 index 000000000..8d79902c5 --- /dev/null +++ b/contrib/ci/jobs/115-build-debian-trixie-arm64-gen/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/jobs/115-build-debian-trixie-arm64-generated/Containerfile b/contrib/ci/jobs/115-build-debian-trixie-arm64-generated/Containerfile deleted file mode 100755 index dc6d84149..000000000 --- a/contrib/ci/jobs/115-build-debian-trixie-arm64-generated/Containerfile +++ /dev/null @@ -1,68 +0,0 @@ -FROM docker.io/library/debian:trixie - -ENV DEBIAN_FRONTEND=noninteractive - -RUN apt-get update -yqq && \ - apt-get install -yqq \ - autoconf \ - autopoint \ - curl \ - bash \ - coreutils \ - git \ - libcurl4-gnutls-dev \ - libgcrypt-dev \ - libidn11-dev \ - libjansson-dev \ - libmicrohttpd-dev \ - libpq-dev \ - libqrencode-dev \ - libsodium-dev \ - libtool \ - libunistring-dev \ - make \ - pkg-config \ - python3-pip \ - python3-sphinx \ - python3-sphinx-rtd-theme \ - recutils \ - texinfo \ - zlib1g-dev \ - # For mustach testing (optional) \ - libjson-c-dev \ - # Debian packaging tools \ - po-debconf \ - build-essential \ - debhelper-compat \ - devscripts \ - git-buildpackage \ - # Documentation dependencies \ - doxygen \ - graphviz \ - pandoc \ - # Test suite dependencies \ - jq \ - postgresql \ - sudo \ - wget - -# Install Taler (and friends) packages -RUN curl -sS https://deb.taler.net/apt-nightly/taler-bookworm-ci.sources \ - | tee /etc/apt/sources.list.d/taler-bookworm-ci.sources - -RUN echo '\ -Package: * \n\ -Pin: origin "deb.taler.net" \n\ -Pin-Priority: 999' > /etc/apt/preferences.d/taler - -RUN cat /etc/apt/preferences.d/taler && \ - apt-get update -y && \ - apt-get install -y \ - libgnunet-dev \ - libgnunet \ - gnunet \ -&& rm -rf /var/lib/apt/lists/* - -WORKDIR /workdir - -CMD ["bash", "/workdir/ci/ci.sh"] diff --git a/contrib/ci/jobs/115-build-debian-trixie-arm64-generated/build.sh b/contrib/ci/jobs/115-build-debian-trixie-arm64-generated/build.sh deleted file mode 100755 index d3fcfab85..000000000 --- a/contrib/ci/jobs/115-build-debian-trixie-arm64-generated/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/jobs/115-build-debian-trixie-arm64-generated/config.ini b/contrib/ci/jobs/115-build-debian-trixie-arm64-generated/config.ini deleted file mode 100755 index 2a99a970e..000000000 --- a/contrib/ci/jobs/115-build-debian-trixie-arm64-generated/config.ini +++ /dev/null @@ -1,7 +0,0 @@ -[build] -HALT_ON_FAILURE = True -WARN_ON_FAILURE = True -CONTAINER_BUILD = True -CONTAINER_NAME = exchange:arm64 -CONTAINER_ARCH = arm64 - diff --git a/contrib/ci/jobs/115-build-debian-trixie-arm64-generated/job.sh b/contrib/ci/jobs/115-build-debian-trixie-arm64-generated/job.sh deleted file mode 100755 index 8d79902c5..000000000 --- a/contrib/ci/jobs/115-build-debian-trixie-arm64-generated/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/jobs/116-deb-package-debian-trixie-arm64-gen/Containerfile b/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-gen/Containerfile new file mode 100755 index 000000000..dc6d84149 --- /dev/null +++ b/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-gen/Containerfile @@ -0,0 +1,68 @@ +FROM docker.io/library/debian:trixie + +ENV DEBIAN_FRONTEND=noninteractive + +RUN apt-get update -yqq && \ + apt-get install -yqq \ + autoconf \ + autopoint \ + curl \ + bash \ + coreutils \ + git \ + libcurl4-gnutls-dev \ + libgcrypt-dev \ + libidn11-dev \ + libjansson-dev \ + libmicrohttpd-dev \ + libpq-dev \ + libqrencode-dev \ + libsodium-dev \ + libtool \ + libunistring-dev \ + make \ + pkg-config \ + python3-pip \ + python3-sphinx \ + python3-sphinx-rtd-theme \ + recutils \ + texinfo \ + zlib1g-dev \ + # For mustach testing (optional) \ + libjson-c-dev \ + # Debian packaging tools \ + po-debconf \ + build-essential \ + debhelper-compat \ + devscripts \ + git-buildpackage \ + # Documentation dependencies \ + doxygen \ + graphviz \ + pandoc \ + # Test suite dependencies \ + jq \ + postgresql \ + sudo \ + wget + +# Install Taler (and friends) packages +RUN curl -sS https://deb.taler.net/apt-nightly/taler-bookworm-ci.sources \ + | tee /etc/apt/sources.list.d/taler-bookworm-ci.sources + +RUN echo '\ +Package: * \n\ +Pin: origin "deb.taler.net" \n\ +Pin-Priority: 999' > /etc/apt/preferences.d/taler + +RUN cat /etc/apt/preferences.d/taler && \ + apt-get update -y && \ + apt-get install -y \ + libgnunet-dev \ + libgnunet \ + gnunet \ +&& rm -rf /var/lib/apt/lists/* + +WORKDIR /workdir + +CMD ["bash", "/workdir/ci/ci.sh"] diff --git a/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-gen/config.ini b/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-gen/config.ini new file mode 100755 index 000000000..2a99a970e --- /dev/null +++ b/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-gen/config.ini @@ -0,0 +1,7 @@ +[build] +HALT_ON_FAILURE = True +WARN_ON_FAILURE = True +CONTAINER_BUILD = True +CONTAINER_NAME = exchange:arm64 +CONTAINER_ARCH = arm64 + 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 new file mode 100755 index 000000000..8334c5a7a --- /dev/null +++ b/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-gen/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/jobs/116-deb-package-debian-trixie-arm64-gen/job.sh b/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-gen/job.sh new file mode 100755 index 000000000..922f8bf63 --- /dev/null +++ b/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-gen/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/jobs/116-deb-package-debian-trixie-arm64-gen/version.sh b/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-gen/version.sh new file mode 100755 index 000000000..52031b23a --- /dev/null +++ b/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-gen/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/116-deb-package-debian-trixie-arm64-generated/Containerfile b/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-generated/Containerfile deleted file mode 100755 index dc6d84149..000000000 --- a/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-generated/Containerfile +++ /dev/null @@ -1,68 +0,0 @@ -FROM docker.io/library/debian:trixie - -ENV DEBIAN_FRONTEND=noninteractive - -RUN apt-get update -yqq && \ - apt-get install -yqq \ - autoconf \ - autopoint \ - curl \ - bash \ - coreutils \ - git \ - libcurl4-gnutls-dev \ - libgcrypt-dev \ - libidn11-dev \ - libjansson-dev \ - libmicrohttpd-dev \ - libpq-dev \ - libqrencode-dev \ - libsodium-dev \ - libtool \ - libunistring-dev \ - make \ - pkg-config \ - python3-pip \ - python3-sphinx \ - python3-sphinx-rtd-theme \ - recutils \ - texinfo \ - zlib1g-dev \ - # For mustach testing (optional) \ - libjson-c-dev \ - # Debian packaging tools \ - po-debconf \ - build-essential \ - debhelper-compat \ - devscripts \ - git-buildpackage \ - # Documentation dependencies \ - doxygen \ - graphviz \ - pandoc \ - # Test suite dependencies \ - jq \ - postgresql \ - sudo \ - wget - -# Install Taler (and friends) packages -RUN curl -sS https://deb.taler.net/apt-nightly/taler-bookworm-ci.sources \ - | tee /etc/apt/sources.list.d/taler-bookworm-ci.sources - -RUN echo '\ -Package: * \n\ -Pin: origin "deb.taler.net" \n\ -Pin-Priority: 999' > /etc/apt/preferences.d/taler - -RUN cat /etc/apt/preferences.d/taler && \ - apt-get update -y && \ - apt-get install -y \ - libgnunet-dev \ - libgnunet \ - gnunet \ -&& rm -rf /var/lib/apt/lists/* - -WORKDIR /workdir - -CMD ["bash", "/workdir/ci/ci.sh"] diff --git a/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-generated/config.ini b/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-generated/config.ini deleted file mode 100755 index 2a99a970e..000000000 --- a/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-generated/config.ini +++ /dev/null @@ -1,7 +0,0 @@ -[build] -HALT_ON_FAILURE = True -WARN_ON_FAILURE = True -CONTAINER_BUILD = True -CONTAINER_NAME = exchange:arm64 -CONTAINER_ARCH = arm64 - diff --git a/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-generated/install-fix.patch b/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-generated/install-fix.patch deleted file mode 100755 index 8334c5a7a..000000000 --- a/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-generated/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-generated/job.sh b/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-generated/job.sh deleted file mode 100755 index 922f8bf63..000000000 --- a/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-generated/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/jobs/116-deb-package-debian-trixie-arm64-generated/version.sh b/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-generated/version.sh deleted file mode 100755 index 52031b23a..000000000 --- a/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-generated/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/117-deploy-package-debian-trixie-arm64-generated/config.ini b/contrib/ci/jobs/117-deploy-package-debian-trixie-arm64-generated/config.ini deleted file mode 100755 index 8d6409a6e..000000000 --- a/contrib/ci/jobs/117-deploy-package-debian-trixie-arm64-generated/config.ini +++ /dev/null @@ -1,5 +0,0 @@ -[build] -HALT_ON_FAILURE = True -WARN_ON_FAILURE = True -CONTAINER_BUILD = False -CONTAINER_NAME = nixery.dev/shell/rsync diff --git a/contrib/ci/jobs/117-deploy-package-debian-trixie-arm64-generated/job.sh b/contrib/ci/jobs/117-deploy-package-debian-trixie-arm64-generated/job.sh deleted file mode 100755 index 4793d5bb1..000000000 --- a/contrib/ci/jobs/117-deploy-package-debian-trixie-arm64-generated/job.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -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/117-upload-debian-trixie-arm64-gen/config.ini b/contrib/ci/jobs/117-upload-debian-trixie-arm64-gen/config.ini new file mode 100755 index 000000000..8d6409a6e --- /dev/null +++ b/contrib/ci/jobs/117-upload-debian-trixie-arm64-gen/config.ini @@ -0,0 +1,5 @@ +[build] +HALT_ON_FAILURE = True +WARN_ON_FAILURE = True +CONTAINER_BUILD = False +CONTAINER_NAME = nixery.dev/shell/rsync 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 new file mode 100755 index 000000000..4793d5bb1 --- /dev/null +++ b/contrib/ci/jobs/117-upload-debian-trixie-arm64-gen/job.sh @@ -0,0 +1,18 @@ +#!/bin/bash +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/Containerfile b/contrib/ci/jobs/120-build-debian-unstable-amd64-gen/Containerfile new file mode 100755 index 000000000..c3bbade45 --- /dev/null +++ b/contrib/ci/jobs/120-build-debian-unstable-amd64-gen/Containerfile @@ -0,0 +1,68 @@ +FROM docker.io/library/debian:unstable + +ENV DEBIAN_FRONTEND=noninteractive + +RUN apt-get update -yqq && \ + apt-get install -yqq \ + autoconf \ + autopoint \ + curl \ + bash \ + coreutils \ + git \ + libcurl4-gnutls-dev \ + libgcrypt-dev \ + libidn11-dev \ + libjansson-dev \ + libmicrohttpd-dev \ + libpq-dev \ + libqrencode-dev \ + libsodium-dev \ + libtool \ + libunistring-dev \ + make \ + pkg-config \ + python3-pip \ + python3-sphinx \ + python3-sphinx-rtd-theme \ + recutils \ + texinfo \ + zlib1g-dev \ + # For mustach testing (optional) \ + libjson-c-dev \ + # Debian packaging tools \ + po-debconf \ + build-essential \ + debhelper-compat \ + devscripts \ + git-buildpackage \ + # Documentation dependencies \ + doxygen \ + graphviz \ + pandoc \ + # Test suite dependencies \ + jq \ + postgresql \ + sudo \ + wget + +# Install Taler (and friends) packages +RUN curl -sS https://deb.taler.net/apt-nightly/taler-bookworm-ci.sources \ + | tee /etc/apt/sources.list.d/taler-bookworm-ci.sources + +RUN echo '\ +Package: * \n\ +Pin: origin "deb.taler.net" \n\ +Pin-Priority: 999' > /etc/apt/preferences.d/taler + +RUN cat /etc/apt/preferences.d/taler && \ + apt-get update -y && \ + apt-get install -y \ + libgnunet-dev \ + libgnunet \ + gnunet \ +&& rm -rf /var/lib/apt/lists/* + +WORKDIR /workdir + +CMD ["bash", "/workdir/ci/ci.sh"] diff --git a/contrib/ci/jobs/120-build-debian-unstable-amd64-gen/build.sh b/contrib/ci/jobs/120-build-debian-unstable-amd64-gen/build.sh new file mode 100755 index 000000000..d3fcfab85 --- /dev/null +++ b/contrib/ci/jobs/120-build-debian-unstable-amd64-gen/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/jobs/120-build-debian-unstable-amd64-gen/job.sh b/contrib/ci/jobs/120-build-debian-unstable-amd64-gen/job.sh new file mode 100755 index 000000000..8d79902c5 --- /dev/null +++ b/contrib/ci/jobs/120-build-debian-unstable-amd64-gen/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/jobs/120-build-debian-unstable-amd64-generated/Containerfile b/contrib/ci/jobs/120-build-debian-unstable-amd64-generated/Containerfile deleted file mode 100755 index c3bbade45..000000000 --- a/contrib/ci/jobs/120-build-debian-unstable-amd64-generated/Containerfile +++ /dev/null @@ -1,68 +0,0 @@ -FROM docker.io/library/debian:unstable - -ENV DEBIAN_FRONTEND=noninteractive - -RUN apt-get update -yqq && \ - apt-get install -yqq \ - autoconf \ - autopoint \ - curl \ - bash \ - coreutils \ - git \ - libcurl4-gnutls-dev \ - libgcrypt-dev \ - libidn11-dev \ - libjansson-dev \ - libmicrohttpd-dev \ - libpq-dev \ - libqrencode-dev \ - libsodium-dev \ - libtool \ - libunistring-dev \ - make \ - pkg-config \ - python3-pip \ - python3-sphinx \ - python3-sphinx-rtd-theme \ - recutils \ - texinfo \ - zlib1g-dev \ - # For mustach testing (optional) \ - libjson-c-dev \ - # Debian packaging tools \ - po-debconf \ - build-essential \ - debhelper-compat \ - devscripts \ - git-buildpackage \ - # Documentation dependencies \ - doxygen \ - graphviz \ - pandoc \ - # Test suite dependencies \ - jq \ - postgresql \ - sudo \ - wget - -# Install Taler (and friends) packages -RUN curl -sS https://deb.taler.net/apt-nightly/taler-bookworm-ci.sources \ - | tee /etc/apt/sources.list.d/taler-bookworm-ci.sources - -RUN echo '\ -Package: * \n\ -Pin: origin "deb.taler.net" \n\ -Pin-Priority: 999' > /etc/apt/preferences.d/taler - -RUN cat /etc/apt/preferences.d/taler && \ - apt-get update -y && \ - apt-get install -y \ - libgnunet-dev \ - libgnunet \ - gnunet \ -&& rm -rf /var/lib/apt/lists/* - -WORKDIR /workdir - -CMD ["bash", "/workdir/ci/ci.sh"] diff --git a/contrib/ci/jobs/120-build-debian-unstable-amd64-generated/build.sh b/contrib/ci/jobs/120-build-debian-unstable-amd64-generated/build.sh deleted file mode 100755 index d3fcfab85..000000000 --- a/contrib/ci/jobs/120-build-debian-unstable-amd64-generated/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/jobs/120-build-debian-unstable-amd64-generated/job.sh b/contrib/ci/jobs/120-build-debian-unstable-amd64-generated/job.sh deleted file mode 100755 index 8d79902c5..000000000 --- a/contrib/ci/jobs/120-build-debian-unstable-amd64-generated/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/jobs/121-deb-package-debian-unstable-amd64-gen/Containerfile b/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-gen/Containerfile new file mode 100755 index 000000000..c3bbade45 --- /dev/null +++ b/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-gen/Containerfile @@ -0,0 +1,68 @@ +FROM docker.io/library/debian:unstable + +ENV DEBIAN_FRONTEND=noninteractive + +RUN apt-get update -yqq && \ + apt-get install -yqq \ + autoconf \ + autopoint \ + curl \ + bash \ + coreutils \ + git \ + libcurl4-gnutls-dev \ + libgcrypt-dev \ + libidn11-dev \ + libjansson-dev \ + libmicrohttpd-dev \ + libpq-dev \ + libqrencode-dev \ + libsodium-dev \ + libtool \ + libunistring-dev \ + make \ + pkg-config \ + python3-pip \ + python3-sphinx \ + python3-sphinx-rtd-theme \ + recutils \ + texinfo \ + zlib1g-dev \ + # For mustach testing (optional) \ + libjson-c-dev \ + # Debian packaging tools \ + po-debconf \ + build-essential \ + debhelper-compat \ + devscripts \ + git-buildpackage \ + # Documentation dependencies \ + doxygen \ + graphviz \ + pandoc \ + # Test suite dependencies \ + jq \ + postgresql \ + sudo \ + wget + +# Install Taler (and friends) packages +RUN curl -sS https://deb.taler.net/apt-nightly/taler-bookworm-ci.sources \ + | tee /etc/apt/sources.list.d/taler-bookworm-ci.sources + +RUN echo '\ +Package: * \n\ +Pin: origin "deb.taler.net" \n\ +Pin-Priority: 999' > /etc/apt/preferences.d/taler + +RUN cat /etc/apt/preferences.d/taler && \ + apt-get update -y && \ + apt-get install -y \ + libgnunet-dev \ + libgnunet \ + gnunet \ +&& rm -rf /var/lib/apt/lists/* + +WORKDIR /workdir + +CMD ["bash", "/workdir/ci/ci.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 new file mode 100755 index 000000000..8334c5a7a --- /dev/null +++ b/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-gen/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/jobs/121-deb-package-debian-unstable-amd64-gen/job.sh b/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-gen/job.sh new file mode 100755 index 000000000..922f8bf63 --- /dev/null +++ b/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-gen/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/jobs/121-deb-package-debian-unstable-amd64-gen/version.sh b/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-gen/version.sh new file mode 100755 index 000000000..52031b23a --- /dev/null +++ b/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-gen/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/121-deb-package-debian-unstable-amd64-generated/Containerfile b/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-generated/Containerfile deleted file mode 100755 index c3bbade45..000000000 --- a/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-generated/Containerfile +++ /dev/null @@ -1,68 +0,0 @@ -FROM docker.io/library/debian:unstable - -ENV DEBIAN_FRONTEND=noninteractive - -RUN apt-get update -yqq && \ - apt-get install -yqq \ - autoconf \ - autopoint \ - curl \ - bash \ - coreutils \ - git \ - libcurl4-gnutls-dev \ - libgcrypt-dev \ - libidn11-dev \ - libjansson-dev \ - libmicrohttpd-dev \ - libpq-dev \ - libqrencode-dev \ - libsodium-dev \ - libtool \ - libunistring-dev \ - make \ - pkg-config \ - python3-pip \ - python3-sphinx \ - python3-sphinx-rtd-theme \ - recutils \ - texinfo \ - zlib1g-dev \ - # For mustach testing (optional) \ - libjson-c-dev \ - # Debian packaging tools \ - po-debconf \ - build-essential \ - debhelper-compat \ - devscripts \ - git-buildpackage \ - # Documentation dependencies \ - doxygen \ - graphviz \ - pandoc \ - # Test suite dependencies \ - jq \ - postgresql \ - sudo \ - wget - -# Install Taler (and friends) packages -RUN curl -sS https://deb.taler.net/apt-nightly/taler-bookworm-ci.sources \ - | tee /etc/apt/sources.list.d/taler-bookworm-ci.sources - -RUN echo '\ -Package: * \n\ -Pin: origin "deb.taler.net" \n\ -Pin-Priority: 999' > /etc/apt/preferences.d/taler - -RUN cat /etc/apt/preferences.d/taler && \ - apt-get update -y && \ - apt-get install -y \ - libgnunet-dev \ - libgnunet \ - gnunet \ -&& rm -rf /var/lib/apt/lists/* - -WORKDIR /workdir - -CMD ["bash", "/workdir/ci/ci.sh"] diff --git a/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-generated/install-fix.patch b/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-generated/install-fix.patch deleted file mode 100755 index 8334c5a7a..000000000 --- a/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-generated/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-generated/job.sh b/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-generated/job.sh deleted file mode 100755 index 922f8bf63..000000000 --- a/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-generated/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/jobs/121-deb-package-debian-unstable-amd64-generated/version.sh b/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-generated/version.sh deleted file mode 100755 index 52031b23a..000000000 --- a/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-generated/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/122-deploy-package-debian-unstable-amd64-generated/config.ini b/contrib/ci/jobs/122-deploy-package-debian-unstable-amd64-generated/config.ini deleted file mode 100755 index 8d6409a6e..000000000 --- a/contrib/ci/jobs/122-deploy-package-debian-unstable-amd64-generated/config.ini +++ /dev/null @@ -1,5 +0,0 @@ -[build] -HALT_ON_FAILURE = True -WARN_ON_FAILURE = True -CONTAINER_BUILD = False -CONTAINER_NAME = nixery.dev/shell/rsync diff --git a/contrib/ci/jobs/122-deploy-package-debian-unstable-amd64-generated/job.sh b/contrib/ci/jobs/122-deploy-package-debian-unstable-amd64-generated/job.sh deleted file mode 100755 index ac6c27e56..000000000 --- a/contrib/ci/jobs/122-deploy-package-debian-unstable-amd64-generated/job.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -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/122-upload-debian-unstable-amd64-gen/config.ini b/contrib/ci/jobs/122-upload-debian-unstable-amd64-gen/config.ini new file mode 100755 index 000000000..8d6409a6e --- /dev/null +++ b/contrib/ci/jobs/122-upload-debian-unstable-amd64-gen/config.ini @@ -0,0 +1,5 @@ +[build] +HALT_ON_FAILURE = True +WARN_ON_FAILURE = True +CONTAINER_BUILD = False +CONTAINER_NAME = nixery.dev/shell/rsync 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 new file mode 100755 index 000000000..ac6c27e56 --- /dev/null +++ b/contrib/ci/jobs/122-upload-debian-unstable-amd64-gen/job.sh @@ -0,0 +1,18 @@ +#!/bin/bash +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/Containerfile b/contrib/ci/jobs/125-build-debian-unstable-arm64-gen/Containerfile new file mode 100755 index 000000000..c3bbade45 --- /dev/null +++ b/contrib/ci/jobs/125-build-debian-unstable-arm64-gen/Containerfile @@ -0,0 +1,68 @@ +FROM docker.io/library/debian:unstable + +ENV DEBIAN_FRONTEND=noninteractive + +RUN apt-get update -yqq && \ + apt-get install -yqq \ + autoconf \ + autopoint \ + curl \ + bash \ + coreutils \ + git \ + libcurl4-gnutls-dev \ + libgcrypt-dev \ + libidn11-dev \ + libjansson-dev \ + libmicrohttpd-dev \ + libpq-dev \ + libqrencode-dev \ + libsodium-dev \ + libtool \ + libunistring-dev \ + make \ + pkg-config \ + python3-pip \ + python3-sphinx \ + python3-sphinx-rtd-theme \ + recutils \ + texinfo \ + zlib1g-dev \ + # For mustach testing (optional) \ + libjson-c-dev \ + # Debian packaging tools \ + po-debconf \ + build-essential \ + debhelper-compat \ + devscripts \ + git-buildpackage \ + # Documentation dependencies \ + doxygen \ + graphviz \ + pandoc \ + # Test suite dependencies \ + jq \ + postgresql \ + sudo \ + wget + +# Install Taler (and friends) packages +RUN curl -sS https://deb.taler.net/apt-nightly/taler-bookworm-ci.sources \ + | tee /etc/apt/sources.list.d/taler-bookworm-ci.sources + +RUN echo '\ +Package: * \n\ +Pin: origin "deb.taler.net" \n\ +Pin-Priority: 999' > /etc/apt/preferences.d/taler + +RUN cat /etc/apt/preferences.d/taler && \ + apt-get update -y && \ + apt-get install -y \ + libgnunet-dev \ + libgnunet \ + gnunet \ +&& rm -rf /var/lib/apt/lists/* + +WORKDIR /workdir + +CMD ["bash", "/workdir/ci/ci.sh"] diff --git a/contrib/ci/jobs/125-build-debian-unstable-arm64-gen/build.sh b/contrib/ci/jobs/125-build-debian-unstable-arm64-gen/build.sh new file mode 100755 index 000000000..d3fcfab85 --- /dev/null +++ b/contrib/ci/jobs/125-build-debian-unstable-arm64-gen/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/jobs/125-build-debian-unstable-arm64-gen/config.ini b/contrib/ci/jobs/125-build-debian-unstable-arm64-gen/config.ini new file mode 100755 index 000000000..2a99a970e --- /dev/null +++ b/contrib/ci/jobs/125-build-debian-unstable-arm64-gen/config.ini @@ -0,0 +1,7 @@ +[build] +HALT_ON_FAILURE = True +WARN_ON_FAILURE = True +CONTAINER_BUILD = True +CONTAINER_NAME = exchange:arm64 +CONTAINER_ARCH = arm64 + 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 new file mode 100755 index 000000000..8d79902c5 --- /dev/null +++ b/contrib/ci/jobs/125-build-debian-unstable-arm64-gen/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/jobs/125-build-debian-unstable-arm64-generated/Containerfile b/contrib/ci/jobs/125-build-debian-unstable-arm64-generated/Containerfile deleted file mode 100755 index c3bbade45..000000000 --- a/contrib/ci/jobs/125-build-debian-unstable-arm64-generated/Containerfile +++ /dev/null @@ -1,68 +0,0 @@ -FROM docker.io/library/debian:unstable - -ENV DEBIAN_FRONTEND=noninteractive - -RUN apt-get update -yqq && \ - apt-get install -yqq \ - autoconf \ - autopoint \ - curl \ - bash \ - coreutils \ - git \ - libcurl4-gnutls-dev \ - libgcrypt-dev \ - libidn11-dev \ - libjansson-dev \ - libmicrohttpd-dev \ - libpq-dev \ - libqrencode-dev \ - libsodium-dev \ - libtool \ - libunistring-dev \ - make \ - pkg-config \ - python3-pip \ - python3-sphinx \ - python3-sphinx-rtd-theme \ - recutils \ - texinfo \ - zlib1g-dev \ - # For mustach testing (optional) \ - libjson-c-dev \ - # Debian packaging tools \ - po-debconf \ - build-essential \ - debhelper-compat \ - devscripts \ - git-buildpackage \ - # Documentation dependencies \ - doxygen \ - graphviz \ - pandoc \ - # Test suite dependencies \ - jq \ - postgresql \ - sudo \ - wget - -# Install Taler (and friends) packages -RUN curl -sS https://deb.taler.net/apt-nightly/taler-bookworm-ci.sources \ - | tee /etc/apt/sources.list.d/taler-bookworm-ci.sources - -RUN echo '\ -Package: * \n\ -Pin: origin "deb.taler.net" \n\ -Pin-Priority: 999' > /etc/apt/preferences.d/taler - -RUN cat /etc/apt/preferences.d/taler && \ - apt-get update -y && \ - apt-get install -y \ - libgnunet-dev \ - libgnunet \ - gnunet \ -&& rm -rf /var/lib/apt/lists/* - -WORKDIR /workdir - -CMD ["bash", "/workdir/ci/ci.sh"] diff --git a/contrib/ci/jobs/125-build-debian-unstable-arm64-generated/build.sh b/contrib/ci/jobs/125-build-debian-unstable-arm64-generated/build.sh deleted file mode 100755 index d3fcfab85..000000000 --- a/contrib/ci/jobs/125-build-debian-unstable-arm64-generated/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/jobs/125-build-debian-unstable-arm64-generated/config.ini b/contrib/ci/jobs/125-build-debian-unstable-arm64-generated/config.ini deleted file mode 100755 index 2a99a970e..000000000 --- a/contrib/ci/jobs/125-build-debian-unstable-arm64-generated/config.ini +++ /dev/null @@ -1,7 +0,0 @@ -[build] -HALT_ON_FAILURE = True -WARN_ON_FAILURE = True -CONTAINER_BUILD = True -CONTAINER_NAME = exchange:arm64 -CONTAINER_ARCH = arm64 - diff --git a/contrib/ci/jobs/125-build-debian-unstable-arm64-generated/job.sh b/contrib/ci/jobs/125-build-debian-unstable-arm64-generated/job.sh deleted file mode 100755 index 8d79902c5..000000000 --- a/contrib/ci/jobs/125-build-debian-unstable-arm64-generated/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/jobs/126-deb-package-debian-unstable-arm64-gen/Containerfile b/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-gen/Containerfile new file mode 100755 index 000000000..c3bbade45 --- /dev/null +++ b/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-gen/Containerfile @@ -0,0 +1,68 @@ +FROM docker.io/library/debian:unstable + +ENV DEBIAN_FRONTEND=noninteractive + +RUN apt-get update -yqq && \ + apt-get install -yqq \ + autoconf \ + autopoint \ + curl \ + bash \ + coreutils \ + git \ + libcurl4-gnutls-dev \ + libgcrypt-dev \ + libidn11-dev \ + libjansson-dev \ + libmicrohttpd-dev \ + libpq-dev \ + libqrencode-dev \ + libsodium-dev \ + libtool \ + libunistring-dev \ + make \ + pkg-config \ + python3-pip \ + python3-sphinx \ + python3-sphinx-rtd-theme \ + recutils \ + texinfo \ + zlib1g-dev \ + # For mustach testing (optional) \ + libjson-c-dev \ + # Debian packaging tools \ + po-debconf \ + build-essential \ + debhelper-compat \ + devscripts \ + git-buildpackage \ + # Documentation dependencies \ + doxygen \ + graphviz \ + pandoc \ + # Test suite dependencies \ + jq \ + postgresql \ + sudo \ + wget + +# Install Taler (and friends) packages +RUN curl -sS https://deb.taler.net/apt-nightly/taler-bookworm-ci.sources \ + | tee /etc/apt/sources.list.d/taler-bookworm-ci.sources + +RUN echo '\ +Package: * \n\ +Pin: origin "deb.taler.net" \n\ +Pin-Priority: 999' > /etc/apt/preferences.d/taler + +RUN cat /etc/apt/preferences.d/taler && \ + apt-get update -y && \ + apt-get install -y \ + libgnunet-dev \ + libgnunet \ + gnunet \ +&& rm -rf /var/lib/apt/lists/* + +WORKDIR /workdir + +CMD ["bash", "/workdir/ci/ci.sh"] diff --git a/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-gen/config.ini b/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-gen/config.ini new file mode 100755 index 000000000..2a99a970e --- /dev/null +++ b/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-gen/config.ini @@ -0,0 +1,7 @@ +[build] +HALT_ON_FAILURE = True +WARN_ON_FAILURE = True +CONTAINER_BUILD = True +CONTAINER_NAME = exchange:arm64 +CONTAINER_ARCH = arm64 + 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 new file mode 100755 index 000000000..8334c5a7a --- /dev/null +++ b/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-gen/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/jobs/126-deb-package-debian-unstable-arm64-gen/job.sh b/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-gen/job.sh new file mode 100755 index 000000000..922f8bf63 --- /dev/null +++ b/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-gen/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/jobs/126-deb-package-debian-unstable-arm64-gen/version.sh b/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-gen/version.sh new file mode 100755 index 000000000..52031b23a --- /dev/null +++ b/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-gen/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/126-deb-package-debian-unstable-arm64-generated/Containerfile b/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-generated/Containerfile deleted file mode 100755 index c3bbade45..000000000 --- a/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-generated/Containerfile +++ /dev/null @@ -1,68 +0,0 @@ -FROM docker.io/library/debian:unstable - -ENV DEBIAN_FRONTEND=noninteractive - -RUN apt-get update -yqq && \ - apt-get install -yqq \ - autoconf \ - autopoint \ - curl \ - bash \ - coreutils \ - git \ - libcurl4-gnutls-dev \ - libgcrypt-dev \ - libidn11-dev \ - libjansson-dev \ - libmicrohttpd-dev \ - libpq-dev \ - libqrencode-dev \ - libsodium-dev \ - libtool \ - libunistring-dev \ - make \ - pkg-config \ - python3-pip \ - python3-sphinx \ - python3-sphinx-rtd-theme \ - recutils \ - texinfo \ - zlib1g-dev \ - # For mustach testing (optional) \ - libjson-c-dev \ - # Debian packaging tools \ - po-debconf \ - build-essential \ - debhelper-compat \ - devscripts \ - git-buildpackage \ - # Documentation dependencies \ - doxygen \ - graphviz \ - pandoc \ - # Test suite dependencies \ - jq \ - postgresql \ - sudo \ - wget - -# Install Taler (and friends) packages -RUN curl -sS https://deb.taler.net/apt-nightly/taler-bookworm-ci.sources \ - | tee /etc/apt/sources.list.d/taler-bookworm-ci.sources - -RUN echo '\ -Package: * \n\ -Pin: origin "deb.taler.net" \n\ -Pin-Priority: 999' > /etc/apt/preferences.d/taler - -RUN cat /etc/apt/preferences.d/taler && \ - apt-get update -y && \ - apt-get install -y \ - libgnunet-dev \ - libgnunet \ - gnunet \ -&& rm -rf /var/lib/apt/lists/* - -WORKDIR /workdir - -CMD ["bash", "/workdir/ci/ci.sh"] diff --git a/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-generated/config.ini b/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-generated/config.ini deleted file mode 100755 index 2a99a970e..000000000 --- a/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-generated/config.ini +++ /dev/null @@ -1,7 +0,0 @@ -[build] -HALT_ON_FAILURE = True -WARN_ON_FAILURE = True -CONTAINER_BUILD = True -CONTAINER_NAME = exchange:arm64 -CONTAINER_ARCH = arm64 - diff --git a/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-generated/install-fix.patch b/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-generated/install-fix.patch deleted file mode 100755 index 8334c5a7a..000000000 --- a/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-generated/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-generated/job.sh b/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-generated/job.sh deleted file mode 100755 index 922f8bf63..000000000 --- a/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-generated/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/jobs/126-deb-package-debian-unstable-arm64-generated/version.sh b/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-generated/version.sh deleted file mode 100755 index 52031b23a..000000000 --- a/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-generated/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/127-deploy-package-debian-unstable-arm64-generated/config.ini b/contrib/ci/jobs/127-deploy-package-debian-unstable-arm64-generated/config.ini deleted file mode 100755 index 8d6409a6e..000000000 --- a/contrib/ci/jobs/127-deploy-package-debian-unstable-arm64-generated/config.ini +++ /dev/null @@ -1,5 +0,0 @@ -[build] -HALT_ON_FAILURE = True -WARN_ON_FAILURE = True -CONTAINER_BUILD = False -CONTAINER_NAME = nixery.dev/shell/rsync diff --git a/contrib/ci/jobs/127-deploy-package-debian-unstable-arm64-generated/job.sh b/contrib/ci/jobs/127-deploy-package-debian-unstable-arm64-generated/job.sh deleted file mode 100755 index ac6c27e56..000000000 --- a/contrib/ci/jobs/127-deploy-package-debian-unstable-arm64-generated/job.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -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/127-upload-debian-unstable-arm64-gen/config.ini b/contrib/ci/jobs/127-upload-debian-unstable-arm64-gen/config.ini new file mode 100755 index 000000000..8d6409a6e --- /dev/null +++ b/contrib/ci/jobs/127-upload-debian-unstable-arm64-gen/config.ini @@ -0,0 +1,5 @@ +[build] +HALT_ON_FAILURE = True +WARN_ON_FAILURE = True +CONTAINER_BUILD = False +CONTAINER_NAME = nixery.dev/shell/rsync 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 new file mode 100755 index 000000000..ac6c27e56 --- /dev/null +++ b/contrib/ci/jobs/127-upload-debian-unstable-arm64-gen/job.sh @@ -0,0 +1,18 @@ +#!/bin/bash +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/130-build-debian-unstable-riscv64-gen/Containerfile b/contrib/ci/jobs/130-build-debian-unstable-riscv64-gen/Containerfile new file mode 100755 index 000000000..c3bbade45 --- /dev/null +++ b/contrib/ci/jobs/130-build-debian-unstable-riscv64-gen/Containerfile @@ -0,0 +1,68 @@ +FROM docker.io/library/debian:unstable + +ENV DEBIAN_FRONTEND=noninteractive + +RUN apt-get update -yqq && \ + apt-get install -yqq \ + autoconf \ + autopoint \ + curl \ + bash \ + coreutils \ + git \ + libcurl4-gnutls-dev \ + libgcrypt-dev \ + libidn11-dev \ + libjansson-dev \ + libmicrohttpd-dev \ + libpq-dev \ + libqrencode-dev \ + libsodium-dev \ + libtool \ + libunistring-dev \ + make \ + pkg-config \ + python3-pip \ + python3-sphinx \ + python3-sphinx-rtd-theme \ + recutils \ + texinfo \ + zlib1g-dev \ + # For mustach testing (optional) \ + libjson-c-dev \ + # Debian packaging tools \ + po-debconf \ + build-essential \ + debhelper-compat \ + devscripts \ + git-buildpackage \ + # Documentation dependencies \ + doxygen \ + graphviz \ + pandoc \ + # Test suite dependencies \ + jq \ + postgresql \ + sudo \ + wget + +# Install Taler (and friends) packages +RUN curl -sS https://deb.taler.net/apt-nightly/taler-bookworm-ci.sources \ + | tee /etc/apt/sources.list.d/taler-bookworm-ci.sources + +RUN echo '\ +Package: * \n\ +Pin: origin "deb.taler.net" \n\ +Pin-Priority: 999' > /etc/apt/preferences.d/taler + +RUN cat /etc/apt/preferences.d/taler && \ + apt-get update -y && \ + apt-get install -y \ + libgnunet-dev \ + libgnunet \ + gnunet \ +&& rm -rf /var/lib/apt/lists/* + +WORKDIR /workdir + +CMD ["bash", "/workdir/ci/ci.sh"] diff --git a/contrib/ci/jobs/130-build-debian-unstable-riscv64-gen/build.sh b/contrib/ci/jobs/130-build-debian-unstable-riscv64-gen/build.sh new file mode 100755 index 000000000..d3fcfab85 --- /dev/null +++ b/contrib/ci/jobs/130-build-debian-unstable-riscv64-gen/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/jobs/130-build-debian-unstable-riscv64-gen/config.ini b/contrib/ci/jobs/130-build-debian-unstable-riscv64-gen/config.ini new file mode 100755 index 000000000..f3afa2db7 --- /dev/null +++ b/contrib/ci/jobs/130-build-debian-unstable-riscv64-gen/config.ini @@ -0,0 +1,7 @@ +[build] +HALT_ON_FAILURE = True +WARN_ON_FAILURE = True +CONTAINER_BUILD = True +CONTAINER_NAME = exchange:riscv64 +CONTAINER_ARCH = riscv64 + diff --git a/contrib/ci/jobs/130-build-debian-unstable-riscv64-gen/job.sh b/contrib/ci/jobs/130-build-debian-unstable-riscv64-gen/job.sh new file mode 100755 index 000000000..8d79902c5 --- /dev/null +++ b/contrib/ci/jobs/130-build-debian-unstable-riscv64-gen/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/jobs/130-build-debian-unstable-riscv64-generated/Containerfile b/contrib/ci/jobs/130-build-debian-unstable-riscv64-generated/Containerfile deleted file mode 100755 index c3bbade45..000000000 --- a/contrib/ci/jobs/130-build-debian-unstable-riscv64-generated/Containerfile +++ /dev/null @@ -1,68 +0,0 @@ -FROM docker.io/library/debian:unstable - -ENV DEBIAN_FRONTEND=noninteractive - -RUN apt-get update -yqq && \ - apt-get install -yqq \ - autoconf \ - autopoint \ - curl \ - bash \ - coreutils \ - git \ - libcurl4-gnutls-dev \ - libgcrypt-dev \ - libidn11-dev \ - libjansson-dev \ - libmicrohttpd-dev \ - libpq-dev \ - libqrencode-dev \ - libsodium-dev \ - libtool \ - libunistring-dev \ - make \ - pkg-config \ - python3-pip \ - python3-sphinx \ - python3-sphinx-rtd-theme \ - recutils \ - texinfo \ - zlib1g-dev \ - # For mustach testing (optional) \ - libjson-c-dev \ - # Debian packaging tools \ - po-debconf \ - build-essential \ - debhelper-compat \ - devscripts \ - git-buildpackage \ - # Documentation dependencies \ - doxygen \ - graphviz \ - pandoc \ - # Test suite dependencies \ - jq \ - postgresql \ - sudo \ - wget - -# Install Taler (and friends) packages -RUN curl -sS https://deb.taler.net/apt-nightly/taler-bookworm-ci.sources \ - | tee /etc/apt/sources.list.d/taler-bookworm-ci.sources - -RUN echo '\ -Package: * \n\ -Pin: origin "deb.taler.net" \n\ -Pin-Priority: 999' > /etc/apt/preferences.d/taler - -RUN cat /etc/apt/preferences.d/taler && \ - apt-get update -y && \ - apt-get install -y \ - libgnunet-dev \ - libgnunet \ - gnunet \ -&& rm -rf /var/lib/apt/lists/* - -WORKDIR /workdir - -CMD ["bash", "/workdir/ci/ci.sh"] diff --git a/contrib/ci/jobs/130-build-debian-unstable-riscv64-generated/build.sh b/contrib/ci/jobs/130-build-debian-unstable-riscv64-generated/build.sh deleted file mode 100755 index d3fcfab85..000000000 --- a/contrib/ci/jobs/130-build-debian-unstable-riscv64-generated/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/jobs/130-build-debian-unstable-riscv64-generated/config.ini b/contrib/ci/jobs/130-build-debian-unstable-riscv64-generated/config.ini deleted file mode 100755 index f3afa2db7..000000000 --- a/contrib/ci/jobs/130-build-debian-unstable-riscv64-generated/config.ini +++ /dev/null @@ -1,7 +0,0 @@ -[build] -HALT_ON_FAILURE = True -WARN_ON_FAILURE = True -CONTAINER_BUILD = True -CONTAINER_NAME = exchange:riscv64 -CONTAINER_ARCH = riscv64 - diff --git a/contrib/ci/jobs/130-build-debian-unstable-riscv64-generated/job.sh b/contrib/ci/jobs/130-build-debian-unstable-riscv64-generated/job.sh deleted file mode 100755 index 8d79902c5..000000000 --- a/contrib/ci/jobs/130-build-debian-unstable-riscv64-generated/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/jobs/131-deb-package-debian-unstable-riscv64-gen/Containerfile b/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-gen/Containerfile new file mode 100755 index 000000000..c3bbade45 --- /dev/null +++ b/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-gen/Containerfile @@ -0,0 +1,68 @@ +FROM docker.io/library/debian:unstable + +ENV DEBIAN_FRONTEND=noninteractive + +RUN apt-get update -yqq && \ + apt-get install -yqq \ + autoconf \ + autopoint \ + curl \ + bash \ + coreutils \ + git \ + libcurl4-gnutls-dev \ + libgcrypt-dev \ + libidn11-dev \ + libjansson-dev \ + libmicrohttpd-dev \ + libpq-dev \ + libqrencode-dev \ + libsodium-dev \ + libtool \ + libunistring-dev \ + make \ + pkg-config \ + python3-pip \ + python3-sphinx \ + python3-sphinx-rtd-theme \ + recutils \ + texinfo \ + zlib1g-dev \ + # For mustach testing (optional) \ + libjson-c-dev \ + # Debian packaging tools \ + po-debconf \ + build-essential \ + debhelper-compat \ + devscripts \ + git-buildpackage \ + # Documentation dependencies \ + doxygen \ + graphviz \ + pandoc \ + # Test suite dependencies \ + jq \ + postgresql \ + sudo \ + wget + +# Install Taler (and friends) packages +RUN curl -sS https://deb.taler.net/apt-nightly/taler-bookworm-ci.sources \ + | tee /etc/apt/sources.list.d/taler-bookworm-ci.sources + +RUN echo '\ +Package: * \n\ +Pin: origin "deb.taler.net" \n\ +Pin-Priority: 999' > /etc/apt/preferences.d/taler + +RUN cat /etc/apt/preferences.d/taler && \ + apt-get update -y && \ + apt-get install -y \ + libgnunet-dev \ + libgnunet \ + gnunet \ +&& rm -rf /var/lib/apt/lists/* + +WORKDIR /workdir + +CMD ["bash", "/workdir/ci/ci.sh"] diff --git a/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-gen/config.ini b/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-gen/config.ini new file mode 100755 index 000000000..f3afa2db7 --- /dev/null +++ b/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-gen/config.ini @@ -0,0 +1,7 @@ +[build] +HALT_ON_FAILURE = True +WARN_ON_FAILURE = True +CONTAINER_BUILD = True +CONTAINER_NAME = exchange:riscv64 +CONTAINER_ARCH = riscv64 + diff --git a/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-gen/install-fix.patch b/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-gen/install-fix.patch new file mode 100755 index 000000000..8334c5a7a --- /dev/null +++ b/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-gen/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/jobs/131-deb-package-debian-unstable-riscv64-gen/job.sh b/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-gen/job.sh new file mode 100755 index 000000000..922f8bf63 --- /dev/null +++ b/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-gen/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/jobs/131-deb-package-debian-unstable-riscv64-gen/version.sh b/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-gen/version.sh new file mode 100755 index 000000000..52031b23a --- /dev/null +++ b/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-gen/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/131-deb-package-debian-unstable-riscv64-generated/Containerfile b/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-generated/Containerfile deleted file mode 100755 index c3bbade45..000000000 --- a/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-generated/Containerfile +++ /dev/null @@ -1,68 +0,0 @@ -FROM docker.io/library/debian:unstable - -ENV DEBIAN_FRONTEND=noninteractive - -RUN apt-get update -yqq && \ - apt-get install -yqq \ - autoconf \ - autopoint \ - curl \ - bash \ - coreutils \ - git \ - libcurl4-gnutls-dev \ - libgcrypt-dev \ - libidn11-dev \ - libjansson-dev \ - libmicrohttpd-dev \ - libpq-dev \ - libqrencode-dev \ - libsodium-dev \ - libtool \ - libunistring-dev \ - make \ - pkg-config \ - python3-pip \ - python3-sphinx \ - python3-sphinx-rtd-theme \ - recutils \ - texinfo \ - zlib1g-dev \ - # For mustach testing (optional) \ - libjson-c-dev \ - # Debian packaging tools \ - po-debconf \ - build-essential \ - debhelper-compat \ - devscripts \ - git-buildpackage \ - # Documentation dependencies \ - doxygen \ - graphviz \ - pandoc \ - # Test suite dependencies \ - jq \ - postgresql \ - sudo \ - wget - -# Install Taler (and friends) packages -RUN curl -sS https://deb.taler.net/apt-nightly/taler-bookworm-ci.sources \ - | tee /etc/apt/sources.list.d/taler-bookworm-ci.sources - -RUN echo '\ -Package: * \n\ -Pin: origin "deb.taler.net" \n\ -Pin-Priority: 999' > /etc/apt/preferences.d/taler - -RUN cat /etc/apt/preferences.d/taler && \ - apt-get update -y && \ - apt-get install -y \ - libgnunet-dev \ - libgnunet \ - gnunet \ -&& rm -rf /var/lib/apt/lists/* - -WORKDIR /workdir - -CMD ["bash", "/workdir/ci/ci.sh"] diff --git a/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-generated/config.ini b/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-generated/config.ini deleted file mode 100755 index f3afa2db7..000000000 --- a/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-generated/config.ini +++ /dev/null @@ -1,7 +0,0 @@ -[build] -HALT_ON_FAILURE = True -WARN_ON_FAILURE = True -CONTAINER_BUILD = True -CONTAINER_NAME = exchange:riscv64 -CONTAINER_ARCH = riscv64 - diff --git a/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-generated/install-fix.patch b/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-generated/install-fix.patch deleted file mode 100755 index 8334c5a7a..000000000 --- a/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-generated/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/131-deb-package-debian-unstable-riscv64-generated/job.sh b/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-generated/job.sh deleted file mode 100755 index 922f8bf63..000000000 --- a/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-generated/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/jobs/131-deb-package-debian-unstable-riscv64-generated/version.sh b/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-generated/version.sh deleted file mode 100755 index 52031b23a..000000000 --- a/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-generated/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/132-deploy-package-debian-unstable-riscv64-generated/config.ini b/contrib/ci/jobs/132-deploy-package-debian-unstable-riscv64-generated/config.ini deleted file mode 100755 index 8d6409a6e..000000000 --- a/contrib/ci/jobs/132-deploy-package-debian-unstable-riscv64-generated/config.ini +++ /dev/null @@ -1,5 +0,0 @@ -[build] -HALT_ON_FAILURE = True -WARN_ON_FAILURE = True -CONTAINER_BUILD = False -CONTAINER_NAME = nixery.dev/shell/rsync diff --git a/contrib/ci/jobs/132-deploy-package-debian-unstable-riscv64-generated/job.sh b/contrib/ci/jobs/132-deploy-package-debian-unstable-riscv64-generated/job.sh deleted file mode 100755 index ac6c27e56..000000000 --- a/contrib/ci/jobs/132-deploy-package-debian-unstable-riscv64-generated/job.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -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/132-upload-debian-unstable-riscv64-gen/config.ini b/contrib/ci/jobs/132-upload-debian-unstable-riscv64-gen/config.ini new file mode 100755 index 000000000..8d6409a6e --- /dev/null +++ b/contrib/ci/jobs/132-upload-debian-unstable-riscv64-gen/config.ini @@ -0,0 +1,5 @@ +[build] +HALT_ON_FAILURE = True +WARN_ON_FAILURE = True +CONTAINER_BUILD = False +CONTAINER_NAME = nixery.dev/shell/rsync diff --git a/contrib/ci/jobs/132-upload-debian-unstable-riscv64-gen/job.sh b/contrib/ci/jobs/132-upload-debian-unstable-riscv64-gen/job.sh new file mode 100755 index 000000000..ac6c27e56 --- /dev/null +++ b/contrib/ci/jobs/132-upload-debian-unstable-riscv64-gen/job.sh @@ -0,0 +1,18 @@ +#!/bin/bash +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/deploy-package/config.ini b/contrib/ci/targets/debian/deploy-package/config.ini deleted file mode 100644 index 8d6409a6e..000000000 --- a/contrib/ci/targets/debian/deploy-package/config.ini +++ /dev/null @@ -1,5 +0,0 @@ -[build] -HALT_ON_FAILURE = True -WARN_ON_FAILURE = True -CONTAINER_BUILD = False -CONTAINER_NAME = nixery.dev/shell/rsync diff --git a/contrib/ci/targets/debian/deploy-package/job.sh b/contrib/ci/targets/debian/deploy-package/job.sh deleted file mode 100755 index bc77ef954..000000000 --- a/contrib/ci/targets/debian/deploy-package/job.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -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/targets/debian/setup-job.sh b/contrib/ci/targets/debian/setup-job.sh index ff3e2c34a..ad61c3ef1 100755 --- a/contrib/ci/targets/debian/setup-job.sh +++ b/contrib/ci/targets/debian/setup-job.sh @@ -44,7 +44,7 @@ CONTAINER_ARCH = '"$ARCH"' ' > config.ini fi; -# Generate the deploy-package target -cd "${CI_DIR}/jobs/$(mktarget 2 deploy-package)" -cp "$DISTRO_TARGET/deploy-package/config.ini" ./ -sed "s|bookworm|$CODENAME|g" "$DISTRO_TARGET/deploy-package/job.sh" > ./job.sh +# Generate the upload target +cd "${CI_DIR}/jobs/$(mktarget 2 upload)" +cp "$DISTRO_TARGET/upload/config.ini" ./ +sed "s|bookworm|$CODENAME|g" "$DISTRO_TARGET/upload/job.sh" > ./job.sh diff --git a/contrib/ci/targets/debian/upload/config.ini b/contrib/ci/targets/debian/upload/config.ini new file mode 100644 index 000000000..8d6409a6e --- /dev/null +++ b/contrib/ci/targets/debian/upload/config.ini @@ -0,0 +1,5 @@ +[build] +HALT_ON_FAILURE = True +WARN_ON_FAILURE = True +CONTAINER_BUILD = False +CONTAINER_NAME = nixery.dev/shell/rsync diff --git a/contrib/ci/targets/debian/upload/job.sh b/contrib/ci/targets/debian/upload/job.sh new file mode 100755 index 000000000..bc77ef954 --- /dev/null +++ b/contrib/ci/targets/debian/upload/job.sh @@ -0,0 +1,18 @@ +#!/bin/bash +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; -- cgit v1.2.3