diff options
Diffstat (limited to 'contrib/ci/jobs')
38 files changed, 20 insertions, 729 deletions
diff --git a/contrib/ci/jobs/000-codespell/job.sh b/contrib/ci/jobs/000-codespell/job.sh index 5b73aabf3..3270feb65 100755 --- a/contrib/ci/jobs/000-codespell/job.sh +++ b/contrib/ci/jobs/000-codespell/job.sh @@ -1,107 +1,2 @@ #!/bin/bash -set -exuo pipefail - -job_dir=$(dirname "${BASH_SOURCE[0]}") - -skip=$(cat <<EOF -ABOUT-NLS -*/afl-tests/* -**/auditor/*.sql -**/templating/test-specs/* -*.bbl -*.bib -*build-aux* -*.bst -*.cache/* -*/cbdc-es.tex -*/cbdc-it.tex -*.cls -configure* -config.status -config.guess -./src/include/taler_dbevents.h -*/contrib/* -*/contrib/hellos/** -*.dat -*.deflate -*.doc -*/doc/* -**/doc/flows/main.de.tex -*/doc/texinfo.tex -*.docx -*.ecc -*.eot -*.epgz -*.eps -*.epub -**/ExchangeSelection/example.ts -*.fee -*.fees -*.file -**/fonts/** -*.gif -*/.git/** -*.gz -*/i18n/strings.ts -*.info -*.jpeg -*.jpg -*.??.json -*.json -*/keys/* -*key -*.latexmkrc -*libtool* -*.log -*/m4/* -*.m4 -**/*.map -*.min.js -*.mp4 -*.odg -*.ods -*.odt -*.pack.js -*.pdf -*.png -*.PNG -**/pnpm-lock.yaml -*.po -*.pptx -*.priv -**/rfc.bib -*.rpath -**/signing-key.asc -*.sqlite -*/src/anastasis-data.ts -**/*.svg -*.svg -*.tag -**/templating/mustach** -*/templating/test?/** -*/testcurl/test_tricky.c -*/debian/tmp/** -*/debian/taler-exchange/** -*/debian/.debhelper/** -*/debian/autoreconf.before -*/debian/autoreconf.after -debian/taler-terms-generator/**/* -taler-terms-generator -*.tgz -*.ttf -*.ttf -**/valgrind.h -*/vpn/tests/** -*.wav -*.woff -*.woff2 -*.xcf -*.xlsx -*.zkey -release-artifacts -EOF -); - -echo Current directory: `pwd` - -codespell -I "${job_dir}"/dictionary.txt -S ${skip//$'\n'/,} +exec ./contrib/ci/debian-package-job.sh diff --git a/contrib/ci/jobs/002-test/job.sh b/contrib/ci/jobs/002-test/job.sh index bfb24e335..3270feb65 100755 --- a/contrib/ci/jobs/002-test/job.sh +++ b/contrib/ci/jobs/002-test/job.sh @@ -1,6 +1,2 @@ #!/bin/bash -set -exuo pipefail - -job_dir=$(dirname "${BASH_SOURCE[0]}") - -"${job_dir}"/test.sh +exec ./contrib/ci/debian-package-job.sh diff --git a/contrib/ci/jobs/003-docs/job.sh b/contrib/ci/jobs/003-docs/job.sh index a72bca4ba..3270feb65 100755 --- a/contrib/ci/jobs/003-docs/job.sh +++ b/contrib/ci/jobs/003-docs/job.sh @@ -1,6 +1,2 @@ #!/bin/bash -set -exuo pipefail - -job_dir=$(dirname "${BASH_SOURCE[0]}") - -"${job_dir}"/docs.sh +exec ./contrib/ci/debian-package-job.sh diff --git a/contrib/ci/jobs/100-build-debian-bookworm-amd64-gen/job.sh b/contrib/ci/jobs/100-build-debian-bookworm-amd64-gen/job.sh index 8d79902c5..3270feb65 100755 --- a/contrib/ci/jobs/100-build-debian-bookworm-amd64-gen/job.sh +++ b/contrib/ci/jobs/100-build-debian-bookworm-amd64-gen/job.sh @@ -1,6 +1,2 @@ #!/bin/bash -set -exuo pipefail - -job_dir=$(dirname "${BASH_SOURCE[0]}") - -"${job_dir}"/build.sh +exec ./contrib/ci/debian-package-job.sh 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 deleted file mode 100755 index 922f8bf63..000000000 --- a/contrib/ci/jobs/101-deb-package-debian-bookworm-amd64-gen/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-gen/version.sh b/contrib/ci/jobs/101-deb-package-debian-bookworm-amd64-gen/version.sh deleted file mode 100755 index 52031b23a..000000000 --- a/contrib/ci/jobs/101-deb-package-debian-bookworm-amd64-gen/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-upload-debian-bookworm-amd64-gen/job.sh b/contrib/ci/jobs/102-upload-debian-bookworm-amd64-gen/job.sh index bc77ef954..3270feb65 100755 --- a/contrib/ci/jobs/102-upload-debian-bookworm-amd64-gen/job.sh +++ b/contrib/ci/jobs/102-upload-debian-bookworm-amd64-gen/job.sh @@ -1,18 +1,2 @@ #!/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; +exec ./contrib/ci/debian-package-job.sh diff --git a/contrib/ci/jobs/105-build-debian-bookworm-arm64-gen/job.sh b/contrib/ci/jobs/105-build-debian-bookworm-arm64-gen/job.sh index 8d79902c5..3270feb65 100755 --- a/contrib/ci/jobs/105-build-debian-bookworm-arm64-gen/job.sh +++ b/contrib/ci/jobs/105-build-debian-bookworm-arm64-gen/job.sh @@ -1,6 +1,2 @@ #!/bin/bash -set -exuo pipefail - -job_dir=$(dirname "${BASH_SOURCE[0]}") - -"${job_dir}"/build.sh +exec ./contrib/ci/debian-package-job.sh diff --git a/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-gen/job.sh b/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-gen/job.sh index 922f8bf63..3270feb65 100755 --- a/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-gen/job.sh +++ b/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-gen/job.sh @@ -1,23 +1,2 @@ #!/bin/bash -set -exuo pipefail -# This file is in the public domain. -# Helper script to build the latest DEB packages in the container. - - -unset LD_LIBRARY_PATH - -# Install build-time dependencies. -# Update apt cache first -apt-get update -apt-get upgrade -y -mk-build-deps --install --tool='apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends --yes' debian/control - -export VERSION="$(./contrib/ci/jobs/4-deb-package/version.sh)" -echo "Building package version ${VERSION}" -EMAIL=none gbp dch --dch-opt=-b --ignore-branch --debian-tag="%(version)s" --git-author --new-version="${VERSION}" -./bootstrap -dpkg-buildpackage -rfakeroot -b -uc -us - -ls -alh ../*.deb -mkdir -p /artifacts/exchange/${CI_COMMIT_REF} # Variable comes from CI environment -mv ../*.deb /artifacts/exchange/${CI_COMMIT_REF}/ +exec ./contrib/ci/debian-package-job.sh diff --git a/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-gen/version.sh b/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-gen/version.sh deleted file mode 100755 index 52031b23a..000000000 --- a/contrib/ci/jobs/106-deb-package-debian-bookworm-arm64-gen/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-upload-debian-bookworm-arm64-gen/job.sh b/contrib/ci/jobs/107-upload-debian-bookworm-arm64-gen/job.sh index bc77ef954..3270feb65 100755 --- a/contrib/ci/jobs/107-upload-debian-bookworm-arm64-gen/job.sh +++ b/contrib/ci/jobs/107-upload-debian-bookworm-arm64-gen/job.sh @@ -1,18 +1,2 @@ #!/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; +exec ./contrib/ci/debian-package-job.sh diff --git a/contrib/ci/jobs/110-build-debian-trixie-amd64-gen/job.sh b/contrib/ci/jobs/110-build-debian-trixie-amd64-gen/job.sh index 8d79902c5..3270feb65 100755 --- a/contrib/ci/jobs/110-build-debian-trixie-amd64-gen/job.sh +++ b/contrib/ci/jobs/110-build-debian-trixie-amd64-gen/job.sh @@ -1,6 +1,2 @@ #!/bin/bash -set -exuo pipefail - -job_dir=$(dirname "${BASH_SOURCE[0]}") - -"${job_dir}"/build.sh +exec ./contrib/ci/debian-package-job.sh diff --git a/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-gen/job.sh b/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-gen/job.sh index 922f8bf63..3270feb65 100755 --- a/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-gen/job.sh +++ b/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-gen/job.sh @@ -1,23 +1,2 @@ #!/bin/bash -set -exuo pipefail -# This file is in the public domain. -# Helper script to build the latest DEB packages in the container. - - -unset LD_LIBRARY_PATH - -# Install build-time dependencies. -# Update apt cache first -apt-get update -apt-get upgrade -y -mk-build-deps --install --tool='apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends --yes' debian/control - -export VERSION="$(./contrib/ci/jobs/4-deb-package/version.sh)" -echo "Building package version ${VERSION}" -EMAIL=none gbp dch --dch-opt=-b --ignore-branch --debian-tag="%(version)s" --git-author --new-version="${VERSION}" -./bootstrap -dpkg-buildpackage -rfakeroot -b -uc -us - -ls -alh ../*.deb -mkdir -p /artifacts/exchange/${CI_COMMIT_REF} # Variable comes from CI environment -mv ../*.deb /artifacts/exchange/${CI_COMMIT_REF}/ +exec ./contrib/ci/debian-package-job.sh diff --git a/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-gen/version.sh b/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-gen/version.sh deleted file mode 100755 index 52031b23a..000000000 --- a/contrib/ci/jobs/111-deb-package-debian-trixie-amd64-gen/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-upload-debian-trixie-amd64-gen/job.sh b/contrib/ci/jobs/112-upload-debian-trixie-amd64-gen/job.sh index 4793d5bb1..3270feb65 100755 --- a/contrib/ci/jobs/112-upload-debian-trixie-amd64-gen/job.sh +++ b/contrib/ci/jobs/112-upload-debian-trixie-amd64-gen/job.sh @@ -1,18 +1,2 @@ #!/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; +exec ./contrib/ci/debian-package-job.sh diff --git a/contrib/ci/jobs/115-build-debian-trixie-arm64-gen/job.sh b/contrib/ci/jobs/115-build-debian-trixie-arm64-gen/job.sh index 8d79902c5..3270feb65 100755 --- a/contrib/ci/jobs/115-build-debian-trixie-arm64-gen/job.sh +++ b/contrib/ci/jobs/115-build-debian-trixie-arm64-gen/job.sh @@ -1,6 +1,2 @@ #!/bin/bash -set -exuo pipefail - -job_dir=$(dirname "${BASH_SOURCE[0]}") - -"${job_dir}"/build.sh +exec ./contrib/ci/debian-package-job.sh diff --git a/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-gen/job.sh b/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-gen/job.sh index 922f8bf63..3270feb65 100755 --- a/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-gen/job.sh +++ b/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-gen/job.sh @@ -1,23 +1,2 @@ #!/bin/bash -set -exuo pipefail -# This file is in the public domain. -# Helper script to build the latest DEB packages in the container. - - -unset LD_LIBRARY_PATH - -# Install build-time dependencies. -# Update apt cache first -apt-get update -apt-get upgrade -y -mk-build-deps --install --tool='apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends --yes' debian/control - -export VERSION="$(./contrib/ci/jobs/4-deb-package/version.sh)" -echo "Building package version ${VERSION}" -EMAIL=none gbp dch --dch-opt=-b --ignore-branch --debian-tag="%(version)s" --git-author --new-version="${VERSION}" -./bootstrap -dpkg-buildpackage -rfakeroot -b -uc -us - -ls -alh ../*.deb -mkdir -p /artifacts/exchange/${CI_COMMIT_REF} # Variable comes from CI environment -mv ../*.deb /artifacts/exchange/${CI_COMMIT_REF}/ +exec ./contrib/ci/debian-package-job.sh diff --git a/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-gen/version.sh b/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-gen/version.sh deleted file mode 100755 index 52031b23a..000000000 --- a/contrib/ci/jobs/116-deb-package-debian-trixie-arm64-gen/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-upload-debian-trixie-arm64-gen/job.sh b/contrib/ci/jobs/117-upload-debian-trixie-arm64-gen/job.sh index 4793d5bb1..3270feb65 100755 --- a/contrib/ci/jobs/117-upload-debian-trixie-arm64-gen/job.sh +++ b/contrib/ci/jobs/117-upload-debian-trixie-arm64-gen/job.sh @@ -1,18 +1,2 @@ #!/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; +exec ./contrib/ci/debian-package-job.sh diff --git a/contrib/ci/jobs/120-build-debian-unstable-amd64-gen/job.sh b/contrib/ci/jobs/120-build-debian-unstable-amd64-gen/job.sh index 8d79902c5..3270feb65 100755 --- a/contrib/ci/jobs/120-build-debian-unstable-amd64-gen/job.sh +++ b/contrib/ci/jobs/120-build-debian-unstable-amd64-gen/job.sh @@ -1,6 +1,2 @@ #!/bin/bash -set -exuo pipefail - -job_dir=$(dirname "${BASH_SOURCE[0]}") - -"${job_dir}"/build.sh +exec ./contrib/ci/debian-package-job.sh diff --git a/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-gen/job.sh b/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-gen/job.sh index 922f8bf63..3270feb65 100755 --- a/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-gen/job.sh +++ b/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-gen/job.sh @@ -1,23 +1,2 @@ #!/bin/bash -set -exuo pipefail -# This file is in the public domain. -# Helper script to build the latest DEB packages in the container. - - -unset LD_LIBRARY_PATH - -# Install build-time dependencies. -# Update apt cache first -apt-get update -apt-get upgrade -y -mk-build-deps --install --tool='apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends --yes' debian/control - -export VERSION="$(./contrib/ci/jobs/4-deb-package/version.sh)" -echo "Building package version ${VERSION}" -EMAIL=none gbp dch --dch-opt=-b --ignore-branch --debian-tag="%(version)s" --git-author --new-version="${VERSION}" -./bootstrap -dpkg-buildpackage -rfakeroot -b -uc -us - -ls -alh ../*.deb -mkdir -p /artifacts/exchange/${CI_COMMIT_REF} # Variable comes from CI environment -mv ../*.deb /artifacts/exchange/${CI_COMMIT_REF}/ +exec ./contrib/ci/debian-package-job.sh diff --git a/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-gen/version.sh b/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-gen/version.sh deleted file mode 100755 index 52031b23a..000000000 --- a/contrib/ci/jobs/121-deb-package-debian-unstable-amd64-gen/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-upload-debian-unstable-amd64-gen/job.sh b/contrib/ci/jobs/122-upload-debian-unstable-amd64-gen/job.sh index ac6c27e56..3270feb65 100755 --- a/contrib/ci/jobs/122-upload-debian-unstable-amd64-gen/job.sh +++ b/contrib/ci/jobs/122-upload-debian-unstable-amd64-gen/job.sh @@ -1,18 +1,2 @@ #!/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; +exec ./contrib/ci/debian-package-job.sh diff --git a/contrib/ci/jobs/125-build-debian-unstable-arm64-gen/job.sh b/contrib/ci/jobs/125-build-debian-unstable-arm64-gen/job.sh index 8d79902c5..3270feb65 100755 --- a/contrib/ci/jobs/125-build-debian-unstable-arm64-gen/job.sh +++ b/contrib/ci/jobs/125-build-debian-unstable-arm64-gen/job.sh @@ -1,6 +1,2 @@ #!/bin/bash -set -exuo pipefail - -job_dir=$(dirname "${BASH_SOURCE[0]}") - -"${job_dir}"/build.sh +exec ./contrib/ci/debian-package-job.sh diff --git a/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-gen/job.sh b/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-gen/job.sh index 922f8bf63..3270feb65 100755 --- a/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-gen/job.sh +++ b/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-gen/job.sh @@ -1,23 +1,2 @@ #!/bin/bash -set -exuo pipefail -# This file is in the public domain. -# Helper script to build the latest DEB packages in the container. - - -unset LD_LIBRARY_PATH - -# Install build-time dependencies. -# Update apt cache first -apt-get update -apt-get upgrade -y -mk-build-deps --install --tool='apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends --yes' debian/control - -export VERSION="$(./contrib/ci/jobs/4-deb-package/version.sh)" -echo "Building package version ${VERSION}" -EMAIL=none gbp dch --dch-opt=-b --ignore-branch --debian-tag="%(version)s" --git-author --new-version="${VERSION}" -./bootstrap -dpkg-buildpackage -rfakeroot -b -uc -us - -ls -alh ../*.deb -mkdir -p /artifacts/exchange/${CI_COMMIT_REF} # Variable comes from CI environment -mv ../*.deb /artifacts/exchange/${CI_COMMIT_REF}/ +exec ./contrib/ci/debian-package-job.sh diff --git a/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-gen/version.sh b/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-gen/version.sh deleted file mode 100755 index 52031b23a..000000000 --- a/contrib/ci/jobs/126-deb-package-debian-unstable-arm64-gen/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-upload-debian-unstable-arm64-gen/job.sh b/contrib/ci/jobs/127-upload-debian-unstable-arm64-gen/job.sh index ac6c27e56..3270feb65 100755 --- a/contrib/ci/jobs/127-upload-debian-unstable-arm64-gen/job.sh +++ b/contrib/ci/jobs/127-upload-debian-unstable-arm64-gen/job.sh @@ -1,18 +1,2 @@ #!/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; +exec ./contrib/ci/debian-package-job.sh diff --git a/contrib/ci/jobs/130-build-debian-unstable-riscv64-gen/Containerfile b/contrib/ci/jobs/130-build-debian-unstable-riscv64-gen/Containerfile deleted file mode 100755 index c3bbade45..000000000 --- a/contrib/ci/jobs/130-build-debian-unstable-riscv64-gen/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-gen/build.sh b/contrib/ci/jobs/130-build-debian-unstable-riscv64-gen/build.sh deleted file mode 100755 index d3fcfab85..000000000 --- a/contrib/ci/jobs/130-build-debian-unstable-riscv64-gen/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-gen/config.ini b/contrib/ci/jobs/130-build-debian-unstable-riscv64-gen/config.ini deleted file mode 100755 index f3afa2db7..000000000 --- a/contrib/ci/jobs/130-build-debian-unstable-riscv64-gen/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-gen/job.sh b/contrib/ci/jobs/130-build-debian-unstable-riscv64-gen/job.sh deleted file mode 100755 index 8d79902c5..000000000 --- a/contrib/ci/jobs/130-build-debian-unstable-riscv64-gen/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 deleted file mode 100755 index c3bbade45..000000000 --- a/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-gen/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-gen/config.ini b/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-gen/config.ini deleted file mode 100755 index f3afa2db7..000000000 --- a/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-gen/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-gen/install-fix.patch b/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-gen/install-fix.patch deleted file mode 100755 index 8334c5a7a..000000000 --- a/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-gen/install-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/debian/taler-exchange.install b/debian/taler-exchange.install -index 631c270b..072c6231 100644 ---- a/debian/taler-exchange.install -+++ b/debian/taler-exchange.install -@@ -36,6 +36,6 @@ usr/share/taler/exchange/templates/*.must - debian/etc-taler-exchange/* etc/ - - # Terms of service / privacy policy templates --usr/share/taler/exchange/*.rst -+#usr/share/taler/exchange/terms/*.rst - # Translations of ToS/PP --usr/share/taler/exchange/locale/*/LC_MESSAGES/*.po -+#usr/share/taler/exchange/terms/locale/*/LC_MESSAGES/*.po diff --git a/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-gen/job.sh b/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-gen/job.sh deleted file mode 100755 index 922f8bf63..000000000 --- a/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-gen/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-gen/version.sh b/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-gen/version.sh deleted file mode 100755 index 52031b23a..000000000 --- a/contrib/ci/jobs/131-deb-package-debian-unstable-riscv64-gen/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-upload-debian-unstable-riscv64-gen/config.ini b/contrib/ci/jobs/132-upload-debian-unstable-riscv64-gen/config.ini deleted file mode 100755 index 8d6409a6e..000000000 --- a/contrib/ci/jobs/132-upload-debian-unstable-riscv64-gen/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-upload-debian-unstable-riscv64-gen/job.sh b/contrib/ci/jobs/132-upload-debian-unstable-riscv64-gen/job.sh deleted file mode 100755 index ac6c27e56..000000000 --- a/contrib/ci/jobs/132-upload-debian-unstable-riscv64-gen/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; |