commit 2f06ebbbca10c0391b8b9ba9a988e56f4342744e parent 088db516f9df7fd53b885edaab7585538ded5326 Author: Christian Grothoff <christian@grothoff.org> Date: Thu, 11 Sep 2025 16:35:56 +0200 bookworm -> trixie transition Diffstat:
16 files changed, 33 insertions(+), 44 deletions(-)
diff --git a/contrib/ci/Containerfile b/contrib/ci/Containerfile @@ -1,5 +1,5 @@ # This containerfile is used when no job-specific one exists. -FROM docker.io/library/debian:bookworm +FROM docker.io/library/debian:trixie ENV DEBIAN_FRONTEND=noninteractive @@ -26,7 +26,6 @@ RUN apt-get update -yqq && \ python3-pip \ python3-sphinx \ python3-sphinx-rtd-theme \ - recutils \ texinfo \ zlib1g-dev \ # For mustach testing (optional) \ @@ -52,8 +51,8 @@ RUN apt-get update -yqq && \ faketime # 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 curl -sS https://deb.taler.net/apt-nightly/taler-trixie-ci.sources \ + | tee /etc/apt/sources.list.d/taler-trixie-ci.sources RUN echo '\ Package: * \n\ diff --git a/contrib/ci/jobs/100-build-debian-trixie-amd64-gen/Containerfile b/contrib/ci/jobs/100-build-debian-trixie-amd64-gen/Containerfile @@ -46,8 +46,8 @@ RUN apt-get update -yqq && \ 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 curl -sS https://deb.taler.net/apt-nightly/taler-trixie-ci.sources \ + | tee /etc/apt/sources.list.d/taler-trixie-ci.sources RUN echo '\ Package: * \n\ 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 @@ -46,8 +46,8 @@ RUN apt-get update -yqq && \ 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 curl -sS https://deb.taler.net/apt-nightly/taler-trixie-ci.sources \ + | tee /etc/apt/sources.list.d/taler-trixie-ci.sources RUN echo '\ Package: * \n\ 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 @@ -46,8 +46,8 @@ RUN apt-get update -yqq && \ 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 curl -sS https://deb.taler.net/apt-nightly/taler-trixie-ci.sources \ + | tee /etc/apt/sources.list.d/taler-trixie-ci.sources RUN echo '\ Package: * \n\ diff --git a/contrib/ci/nightly/105-build-debian-bookworm-arm64-gen/Containerfile b/contrib/ci/nightly/105-build-debian-bookworm-arm64-gen/Containerfile @@ -1,4 +1,4 @@ -FROM docker.io/library/debian:bookworm +FROM docker.io/library/debian:trixie ENV DEBIAN_FRONTEND=noninteractive @@ -25,7 +25,6 @@ RUN apt-get update -yqq && \ python3-pip \ python3-sphinx \ python3-sphinx-rtd-theme \ - recutils \ texinfo \ zlib1g-dev \ # For mustach testing (optional) \ @@ -47,8 +46,8 @@ RUN apt-get update -yqq && \ 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 curl -sS https://deb.taler.net/apt-nightly/taler-trixie-ci.sources \ + | tee /etc/apt/sources.list.d/taler-trixie-ci.sources RUN echo '\ Package: * \n\ diff --git a/contrib/ci/nightly/110-build-debian-trixie-amd64-gen/Containerfile b/contrib/ci/nightly/110-build-debian-trixie-amd64-gen/Containerfile @@ -25,7 +25,6 @@ RUN apt-get update -yqq && \ python3-pip \ python3-sphinx \ python3-sphinx-rtd-theme \ - recutils \ texinfo \ zlib1g-dev \ # For mustach testing (optional) \ @@ -47,8 +46,8 @@ RUN apt-get update -yqq && \ 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 curl -sS https://deb.taler.net/apt-nightly/taler-trixie-ci.sources \ + | tee /etc/apt/sources.list.d/taler-trixie-ci.sources RUN echo '\ Package: * \n\ diff --git a/contrib/ci/nightly/111-deb-package-debian-trixie-amd64-gen/Containerfile b/contrib/ci/nightly/111-deb-package-debian-trixie-amd64-gen/Containerfile @@ -25,7 +25,6 @@ RUN apt-get update -yqq && \ python3-pip \ python3-sphinx \ python3-sphinx-rtd-theme \ - recutils \ texinfo \ zlib1g-dev \ # For mustach testing (optional) \ @@ -47,8 +46,8 @@ RUN apt-get update -yqq && \ 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 curl -sS https://deb.taler.net/apt-nightly/taler-trixie-ci.sources \ + | tee /etc/apt/sources.list.d/taler-trixie-ci.sources RUN echo '\ Package: * \n\ diff --git a/contrib/ci/nightly/115-build-debian-trixie-arm64-gen/Containerfile b/contrib/ci/nightly/115-build-debian-trixie-arm64-gen/Containerfile @@ -25,7 +25,6 @@ RUN apt-get update -yqq && \ python3-pip \ python3-sphinx \ python3-sphinx-rtd-theme \ - recutils \ texinfo \ zlib1g-dev \ # For mustach testing (optional) \ @@ -47,8 +46,8 @@ RUN apt-get update -yqq && \ 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 curl -sS https://deb.taler.net/apt-nightly/taler-trixie-ci.sources \ + | tee /etc/apt/sources.list.d/taler-trixie-ci.sources RUN echo '\ Package: * \n\ diff --git a/contrib/ci/nightly/116-deb-package-debian-trixie-arm64-gen/Containerfile b/contrib/ci/nightly/116-deb-package-debian-trixie-arm64-gen/Containerfile @@ -25,7 +25,6 @@ RUN apt-get update -yqq && \ python3-pip \ python3-sphinx \ python3-sphinx-rtd-theme \ - recutils \ texinfo \ zlib1g-dev \ # For mustach testing (optional) \ @@ -47,8 +46,8 @@ RUN apt-get update -yqq && \ 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 curl -sS https://deb.taler.net/apt-nightly/taler-trixie-ci.sources \ + | tee /etc/apt/sources.list.d/taler-trixie-ci.sources RUN echo '\ Package: * \n\ diff --git a/contrib/ci/nightly/120-build-debian-unstable-amd64-gen/Containerfile b/contrib/ci/nightly/120-build-debian-unstable-amd64-gen/Containerfile @@ -25,7 +25,6 @@ RUN apt-get update -yqq && \ python3-pip \ python3-sphinx \ python3-sphinx-rtd-theme \ - recutils \ texinfo \ zlib1g-dev \ # For mustach testing (optional) \ @@ -47,8 +46,8 @@ RUN apt-get update -yqq && \ 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 curl -sS https://deb.taler.net/apt-nightly/taler-trixie-ci.sources \ + | tee /etc/apt/sources.list.d/taler-trixie-ci.sources RUN echo '\ Package: * \n\ diff --git a/contrib/ci/nightly/121-deb-package-debian-unstable-amd64-gen/Containerfile b/contrib/ci/nightly/121-deb-package-debian-unstable-amd64-gen/Containerfile @@ -25,7 +25,6 @@ RUN apt-get update -yqq && \ python3-pip \ python3-sphinx \ python3-sphinx-rtd-theme \ - recutils \ texinfo \ zlib1g-dev \ # For mustach testing (optional) \ @@ -47,8 +46,8 @@ RUN apt-get update -yqq && \ 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 curl -sS https://deb.taler.net/apt-nightly/taler-trixie-ci.sources \ + | tee /etc/apt/sources.list.d/taler-trixie-ci.sources RUN echo '\ Package: * \n\ diff --git a/contrib/ci/nightly/125-build-debian-unstable-arm64-gen/Containerfile b/contrib/ci/nightly/125-build-debian-unstable-arm64-gen/Containerfile @@ -25,7 +25,6 @@ RUN apt-get update -yqq && \ python3-pip \ python3-sphinx \ python3-sphinx-rtd-theme \ - recutils \ texinfo \ zlib1g-dev \ # For mustach testing (optional) \ @@ -47,8 +46,8 @@ RUN apt-get update -yqq && \ 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 curl -sS https://deb.taler.net/apt-nightly/taler-trixie-ci.sources \ + | tee /etc/apt/sources.list.d/taler-trixie-ci.sources RUN echo '\ Package: * \n\ diff --git a/contrib/ci/nightly/126-deb-package-debian-unstable-arm64-gen/Containerfile b/contrib/ci/nightly/126-deb-package-debian-unstable-arm64-gen/Containerfile @@ -25,7 +25,6 @@ RUN apt-get update -yqq && \ python3-pip \ python3-sphinx \ python3-sphinx-rtd-theme \ - recutils \ texinfo \ zlib1g-dev \ # For mustach testing (optional) \ @@ -47,8 +46,8 @@ RUN apt-get update -yqq && \ 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 curl -sS https://deb.taler.net/apt-nightly/taler-trixie-ci.sources \ + | tee /etc/apt/sources.list.d/taler-trixie-ci.sources RUN echo '\ Package: * \n\ diff --git a/contrib/ci/targets/debian/Containerfile b/contrib/ci/targets/debian/Containerfile @@ -1,4 +1,4 @@ -FROM docker.io/library/debian:bookworm +FROM docker.io/library/debian:trixie ENV DEBIAN_FRONTEND=noninteractive @@ -25,7 +25,6 @@ RUN apt-get update -yqq && \ python3-pip \ python3-sphinx \ python3-sphinx-rtd-theme \ - recutils \ texinfo \ zlib1g-dev \ # For mustach testing (optional) \ @@ -47,8 +46,8 @@ RUN apt-get update -yqq && \ 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 curl -sS https://deb.taler.net/apt-nightly/taler-trixie-ci.sources \ + | tee /etc/apt/sources.list.d/taler-trixie-ci.sources RUN echo '\ Package: * \n\ diff --git a/contrib/ci/targets/debian/setup-job.sh b/contrib/ci/targets/debian/setup-job.sh @@ -45,4 +45,4 @@ fi; # 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 +sed "s|trixie|$CODENAME|g" "$DISTRO_TARGET/upload/job.sh" > ./job.sh diff --git a/contrib/ci/targets/debian/upload/job.sh b/contrib/ci/targets/debian/upload/job.sh @@ -9,7 +9,7 @@ if [[ -d "$RELEASE_ARTIFACT_DIR" ]]; then else RSYNC_HOST=${RSYNC_HOST:-"taler.host.internal"} RSYNC_PORT=${RSYNC_PORT:-424242} - RSYNC_PATH=${RSYNC_PATH:-"incoming_packages/bookworm-taler-ci/"} + RSYNC_PATH=${RSYNC_PATH:-"incoming_packages/trixie-taler-ci/"} RSYNC_DEST=${RSYNC_DEST:-"rsync://${RSYNC_HOST}/${RSYNC_PATH}"} rsync -vP \