commit 12ed4226cc3e0da9aa5d1016df50405520c3f968 parent b7c7244ff46f791d478cf58a25501c883b4b172c Author: Christian Grothoff <christian@grothoff.org> Date: Thu, 4 Sep 2025 09:23:56 +0200 switch CI/CD to trixie Diffstat:
17 files changed, 237 insertions(+), 240 deletions(-)
diff --git a/contrib/ci/jobs/100-build-debian-bookworm-amd64-gen/Containerfile b/contrib/ci/jobs/100-build-debian-bookworm-amd64-gen/Containerfile @@ -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-trixie-amd64-gen/Containerfile b/contrib/ci/jobs/100-build-debian-trixie-amd64-gen/Containerfile @@ -0,0 +1,67 @@ +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 \ + 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-trixie-amd64-gen/build.sh diff --git a/contrib/ci/jobs/100-build-debian-bookworm-amd64-gen/job.sh b/contrib/ci/jobs/100-build-debian-trixie-amd64-gen/job.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 @@ -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-trixie-amd64-gen/Containerfile b/contrib/ci/jobs/101-deb-package-debian-trixie-amd64-gen/Containerfile @@ -0,0 +1,67 @@ +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 \ + 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/job.sh b/contrib/ci/jobs/101-deb-package-debian-trixie-amd64-gen/job.sh diff --git a/contrib/ci/jobs/102-upload-debian-bookworm-amd64-gen/job.sh b/contrib/ci/jobs/102-upload-debian-bookworm-amd64-gen/job.sh @@ -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-trixie-amd64-gen/config.ini diff --git a/contrib/ci/jobs/102-upload-debian-trixie-amd64-gen/job.sh b/contrib/ci/jobs/102-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/106-deb-package-debian-bookworm-arm64-gen/Containerfile b/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-gen/Containerfile @@ -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-trixie-arm64-gen/Containerfile b/contrib/ci/jobs/106-deb-package-debian-trixie-arm64-gen/Containerfile @@ -0,0 +1,67 @@ +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 \ + 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-trixie-arm64-gen/config.ini diff --git a/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-gen/job.sh b/contrib/ci/jobs/106-deb-package-debian-trixie-arm64-gen/job.sh diff --git a/contrib/ci/jobs/107-upload-debian-bookworm-arm64-gen/job.sh b/contrib/ci/jobs/107-upload-debian-bookworm-arm64-gen/job.sh @@ -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-trixie-arm64-gen/config.ini diff --git a/contrib/ci/jobs/107-upload-debian-trixie-arm64-gen/job.sh b/contrib/ci/jobs/107-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;