diff options
-rwxr-xr-x | bin/taler-deployment | 96 | ||||
-rw-r--r-- | buildbot/master.cfg | 40 |
2 files changed, 122 insertions, 14 deletions
diff --git a/bin/taler-deployment b/bin/taler-deployment index 7a92650..2d6efcf 100755 --- a/bin/taler-deployment +++ b/bin/taler-deployment @@ -251,13 +251,12 @@ def build_demos(r, p): def build_backoffice(r, p): update_checkout(r, p) - subprocess.run(["./bootstrap"], check=True) + subprocess.run(["./bootstrap"]) pfx = Path.home() / "local" - pyconfigure() - subprocess.run(["make", "install"], check=True) + default_configure() + subprocess.run(["make", "build-single"]) (p / "taler-buildstamp").touch() - def build_docs(r, p): update_checkout(r, p) subprocess.run(["./bootstrap"], check=True) @@ -273,7 +272,26 @@ def get_repos(envname): if envname in ("demochecker",): return [] if envname in ("docs-builder",): - return [Repo("docs", "git://gnunet.org/docs.git", [], build_docs)] + return [ + Repo( + "docs", + "git://gnunet.org/docs.git", + [], + build_docs, + ), + Repo( + "exchange", + "git://git.taler.net/exchange", + ["gnunet", "libmicrohttpd"], + build_exchange, + ), + Repo( + "merchant", + "git://git.taler.net/merchant", + ["exchange", "libmicrohttpd"], + build_merchant, + ), + ] if envname in ("coverage", "integrationtest",): return [ Repo( @@ -282,7 +300,11 @@ def get_repos(envname): [], build_libmicrohttpd, ), - Repo("gnunet", "git://gnunet.org/gnunet.git", [], build_gnunet), + Repo( + "gnunet", + "git://gnunet.org/gnunet.git", + [], + build_gnunet), Repo( "exchange", "git://git.taler.net/exchange", @@ -307,7 +329,24 @@ def get_repos(envname): ["exchange", "merchant"], build_sync, ), - Repo("bank", "git://git.taler.net/bank", [], build_bank), + Repo( + "anastasis", + "git://git.taler.net/anastasis", + ["exchange", "merchant"], + build_sync, + ), + Repo( + "bank", + "git://git.taler.net/bank", + [], + build_bank + ), + Repo( + "merchant-backoffice", + "git://git.taler.net/merchant-backoffice", + [], + build_backoffice, + ), ] # Note: these are currently not in use! @@ -319,7 +358,12 @@ def get_repos(envname): [], build_libmicrohttpd, ), - Repo("gnunet", "git://gnunet.org/gnunet.git", [], build_gnunet), + Repo( + "gnunet", + "git://gnunet.org/gnunet.git", + [], + build_gnunet, + ), Repo( "exchange", "git://git.taler.net/exchange", @@ -332,8 +376,18 @@ def get_repos(envname): ["exchange", "libmicrohttpd"], build_merchant, ), - Repo("bank", "git://git.taler.net/bank", [], build_bank), - Repo("taler-merchant-demos", "git://git.taler.net/taler-merchant-demos", [], build_demos), + Repo( + "bank", + "git://git.taler.net/bank", + [], + build_bank, + ), + Repo( + "taler-merchant-demos", + "git://git.taler.net/taler-merchant-demos", + [], + build_demos, + ), ] if envname in ("tanker", "local", "demo", "int", "test", "auditor-reporter-test", "auditor-reporter-demo"): return [ @@ -349,7 +403,12 @@ def get_repos(envname): [], build_libmicrohttpd, ), - Repo("gnunet", "git://gnunet.org/gnunet.git", [], build_gnunet), + Repo( + "gnunet", + "git://gnunet.org/gnunet.git", + [], + build_gnunet, + ), Repo( "exchange", "git://git.taler.net/exchange", @@ -374,9 +433,18 @@ def get_repos(envname): ["exchange", "merchant", "libmicrohttpd"], build_sync, ), - Repo("bank", "git://git.taler.net/bank", [], build_bank), - Repo("taler-merchant-demos", "git://git.taler.net/taler-merchant-demos", [], build_demos), - Repo("backoffice", "git://git.taler.net/backoffice", [], build_backoffice), + Repo( + "bank", + "git://git.taler.net/bank", + [], + build_bank, + ), + Repo( + "taler-merchant-demos", + "git://git.taler.net/taler-merchant-demos", + [], + build_demos, + ), ] raise Exception(f"no repos defined for envname {envname}") diff --git a/buildbot/master.cfg b/buildbot/master.cfg index a2826e3..52f6efa 100644 --- a/buildbot/master.cfg +++ b/buildbot/master.cfg @@ -197,6 +197,46 @@ DOC_FACTORY.addStep( haltOnFailure=True ) ) +DOC_FACTORY.addStep( + ShellCommand( + name="gana", + description="fetch GANA", + descriptionDone="GANA obtained", + command=["contrib/gana.sh" ], + workdir="../../sources/exchange/" + ) +) +DOC_FACTORY.addStep( + ShellCommand( + name="doxygen::exchange", + description="building exchange doxygen documentation", + descriptionDone="doxygen on exchange finished", + command=["make", "full" ], + workdir="../../sources/exchange/doc/doxygen" + ) +) +DOC_FACTORY.addStep( + steps.ShellSequence( + name="tag", + description="prepare merchant", + descriptionDone="directory created", + commands=[ + util.ShellArg(command=["mkdir", "-p", "merchant/doc/doxygen/"]), + util.ShellArg(command=["cp", "exchange/doc/doxygen/taler-exchange.tag", "merchant/doc/doxygen/taler-exchange.tag"]), + ], + workdir="../../sources/" + ) +) +DOC_FACTORY.addStep( + ShellCommand( + name="doxygen::merchant", + description="building merchant doxygen documentation", + descriptionDone="doxygen on merchant finished", + command=["make", "full" ], + workdir="../../sources/merchant/doc/doxygen" + ) +) + BUILDERS.append(util.BuilderConfig( name="doc-builder", workernames=["doc-worker"], factory=DOC_FACTORY |