gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taler-wallet-core] branch master updated (d845c0cf2 -> 1080987ed)


From: gnunet
Subject: [taler-wallet-core] branch master updated (d845c0cf2 -> 1080987ed)
Date: Sat, 20 Jan 2024 16:21:05 +0100

This is an automated email from the git hooks/post-receive script.

devan-carpenter pushed a change to branch master
in repository wallet-core.

    from d845c0cf2 fixes #8147
     new c13fd58cb ci: use correct path for version script
     new c6062c9d7 ci: make sure bootstrap is run before packaging
     new 6c237ff14 ci: rename job to reflect package name
     new 1080987ed ci: add taler-harness package build job

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../ci/jobs/{0-codespell => 3-wallet-cli-deb-package}/config.ini | 4 ++--
 .../ci/jobs/{3-deb-package => 3-wallet-cli-deb-package}/job.sh   | 5 ++++-
 .../jobs/{3-deb-package => 3-wallet-cli-deb-package}/version.sh  | 0
 .../jobs/{0-codespell => 4-taler-harness-deb-package}/config.ini | 4 ++--
 .../jobs/{3-deb-package => 4-taler-harness-deb-package}/job.sh   | 9 ++++++---
 .../{3-deb-package => 4-taler-harness-deb-package}/version.sh    | 0
 .../ci/jobs/{4-deploy-package => 5-deploy-packages}/config.ini   | 0
 contrib/ci/jobs/{4-deploy-package => 5-deploy-packages}/job.sh   | 0
 8 files changed, 14 insertions(+), 8 deletions(-)
 copy contrib/ci/jobs/{0-codespell => 3-wallet-cli-deb-package}/config.ini (53%)
 copy contrib/ci/jobs/{3-deb-package => 3-wallet-cli-deb-package}/job.sh (86%)
 copy contrib/ci/jobs/{3-deb-package => 3-wallet-cli-deb-package}/version.sh 
(100%)
 copy contrib/ci/jobs/{0-codespell => 4-taler-harness-deb-package}/config.ini 
(53%)
 rename contrib/ci/jobs/{3-deb-package => 4-taler-harness-deb-package}/job.sh 
(81%)
 rename contrib/ci/jobs/{3-deb-package => 
4-taler-harness-deb-package}/version.sh (100%)
 rename contrib/ci/jobs/{4-deploy-package => 5-deploy-packages}/config.ini 
(100%)
 rename contrib/ci/jobs/{4-deploy-package => 5-deploy-packages}/job.sh (100%)

diff --git a/contrib/ci/jobs/0-codespell/config.ini 
b/contrib/ci/jobs/3-wallet-cli-deb-package/config.ini
similarity index 53%
copy from contrib/ci/jobs/0-codespell/config.ini
copy to contrib/ci/jobs/3-wallet-cli-deb-package/config.ini
index bd7d73860..fe4fd36a6 100644
--- a/contrib/ci/jobs/0-codespell/config.ini
+++ b/contrib/ci/jobs/3-wallet-cli-deb-package/config.ini
@@ -1,6 +1,6 @@
 [build]
 HALT_ON_FAILURE = False
 WARN_ON_FAILURE = True
-CONTAINER_BUILD = False
-CONTAINER_NAME = nixery.dev/shell/codespell
+CONTAINER_BUILD = True
+CONTAINER_NAME = localhost/wallet-core
 CONTAINER_ARCH = amd64
diff --git a/contrib/ci/jobs/3-deb-package/job.sh 
b/contrib/ci/jobs/3-wallet-cli-deb-package/job.sh
similarity index 86%
copy from contrib/ci/jobs/3-deb-package/job.sh
copy to contrib/ci/jobs/3-wallet-cli-deb-package/job.sh
index 1bd7f80a2..ac9132929 100755
--- a/contrib/ci/jobs/3-deb-package/job.sh
+++ b/contrib/ci/jobs/3-wallet-cli-deb-package/job.sh
@@ -6,6 +6,9 @@ set -exuo pipefail
 
 unset LD_LIBRARY_PATH
 
+# Run the bootstrap script in case it hasn't been done already at this point
+./bootstrap
+
 # gbp wants the debian directory in the root of the git repo
 # so we symlink in the debian directory for the package we want to create
 rm -f ./debian # in case we already have a symlink there
@@ -20,7 +23,7 @@ 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/3-deb-package/version.sh)"
+export VERSION="$(../../contrib/ci/jobs/3-wallet-cli-deb-package/version.sh)"
 echo "Building package version ${VERSION}"
 
 EMAIL=none gbp dch --ignore-branch --debian-tag="%(version)s" --git-author 
--new-version="${VERSION}"
diff --git a/contrib/ci/jobs/3-deb-package/version.sh 
b/contrib/ci/jobs/3-wallet-cli-deb-package/version.sh
similarity index 100%
copy from contrib/ci/jobs/3-deb-package/version.sh
copy to contrib/ci/jobs/3-wallet-cli-deb-package/version.sh
diff --git a/contrib/ci/jobs/0-codespell/config.ini 
b/contrib/ci/jobs/4-taler-harness-deb-package/config.ini
similarity index 53%
copy from contrib/ci/jobs/0-codespell/config.ini
copy to contrib/ci/jobs/4-taler-harness-deb-package/config.ini
index bd7d73860..fe4fd36a6 100644
--- a/contrib/ci/jobs/0-codespell/config.ini
+++ b/contrib/ci/jobs/4-taler-harness-deb-package/config.ini
@@ -1,6 +1,6 @@
 [build]
 HALT_ON_FAILURE = False
 WARN_ON_FAILURE = True
-CONTAINER_BUILD = False
-CONTAINER_NAME = nixery.dev/shell/codespell
+CONTAINER_BUILD = True
+CONTAINER_NAME = localhost/wallet-core
 CONTAINER_ARCH = amd64
diff --git a/contrib/ci/jobs/3-deb-package/job.sh 
b/contrib/ci/jobs/4-taler-harness-deb-package/job.sh
similarity index 81%
rename from contrib/ci/jobs/3-deb-package/job.sh
rename to contrib/ci/jobs/4-taler-harness-deb-package/job.sh
index 1bd7f80a2..5883d3b50 100755
--- a/contrib/ci/jobs/3-deb-package/job.sh
+++ b/contrib/ci/jobs/4-taler-harness-deb-package/job.sh
@@ -6,13 +6,16 @@ set -exuo pipefail
 
 unset LD_LIBRARY_PATH
 
+# Run the bootstrap script in case it hasn't been done already at this point
+./bootstrap
+
 # gbp wants the debian directory in the root of the git repo
 # so we symlink in the debian directory for the package we want to create
 rm -f ./debian # in case we already have a symlink there
-ln -s packages/taler-wallet-cli/debian .
+ln -s packages/taler-harness/debian .
 
 # Change to our package directory
-cd packages/taler-wallet-cli
+cd packages/taler-harness
 
 # Install build-time dependencies.
 # Update apt cache first
@@ -20,7 +23,7 @@ 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/3-deb-package/version.sh)"
+export 
VERSION="$(../../contrib/ci/jobs/5-taler-harness-deb-package/version.sh)"
 echo "Building package version ${VERSION}"
 
 EMAIL=none gbp dch --ignore-branch --debian-tag="%(version)s" --git-author 
--new-version="${VERSION}"
diff --git a/contrib/ci/jobs/3-deb-package/version.sh 
b/contrib/ci/jobs/4-taler-harness-deb-package/version.sh
similarity index 100%
rename from contrib/ci/jobs/3-deb-package/version.sh
rename to contrib/ci/jobs/4-taler-harness-deb-package/version.sh
diff --git a/contrib/ci/jobs/4-deploy-package/config.ini 
b/contrib/ci/jobs/5-deploy-packages/config.ini
similarity index 100%
rename from contrib/ci/jobs/4-deploy-package/config.ini
rename to contrib/ci/jobs/5-deploy-packages/config.ini
diff --git a/contrib/ci/jobs/4-deploy-package/job.sh 
b/contrib/ci/jobs/5-deploy-packages/job.sh
similarity index 100%
rename from contrib/ci/jobs/4-deploy-package/job.sh
rename to contrib/ci/jobs/5-deploy-packages/job.sh

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]