taler-deployment

commit ed827ce1bc7bd65d477c87d9b01a3b77c44f9526
parent c1c13d4863de56c5dd9114bd59e2339e78b1574d
Author: Marcello Stanisci <stanisci.m@gmail.com>
Date:   Mon, 27 Nov 2017 12:20:38 +0100

reverting to old style

Diffstat:
M
bin/taler-deployment-build
 | 
11
++++-------
M
buildbot/master.cfg
 | 
6
++++++
M
taler-build/Makefile
 | 
2
+-
M
taler-build/MakefileLint
 | 
2
+-
M
taler-build/invalidate.sh
 | 
2
+-
M
taler-build/update_deployment.sh
 | 
1
+

6 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/bin/taler-deployment-build b/bin/taler-deployment-build
@@ -20,14 +20,11 @@ fi
 
 source $HOME/activate
 
-# Check changes
-$HOME/deployment/taler-build/invalidate.sh
+cd $HOME/deployment/taler-build
+./invalidate.sh
 
-# Build
-MAKE="make -f $HOME/deployment/taler-build/Makefile"
-cd $HOME/build_stamps
 if test ${1:-notgiven} = "--coverage"; then
-  $MAKE lcov
+  make lcov
 else
-  $MAKE
+  make
 fi
diff --git a/buildbot/master.cfg b/buildbot/master.cfg
@@ -161,6 +161,8 @@ DEBUG_FACTORY.addStep(ShellCommand(
     command=["echo", "I'm here!"]))
 
 LINT_FACTORY = util.BuildFactory()
+LINT_FACTORY.addStep(git_step(
+    "git://git.taler.net/deployment.git"))
 LINT_FACTORY.addStep(ShellCommand(
     name="invalidation",
     description="checking changes",
@@ -175,6 +177,8 @@ LINT_FACTORY.addStep(ShellCommand(
     workdir="build/taler-build"))
 
 LCOV_FACTORY = util.BuildFactory()
+LCOV_FACTORY.addStep(git_step(
+    'git://git.taler.net/deployment.git'))
 LCOV_FACTORY.addStep(ShellCommand(
     name="invalidation",
     description="Invalidating timestamps",
@@ -191,6 +195,8 @@ LCOV_FACTORY.addStep(ShellCommand(
          "TALER_CHECKDB": "postgresql:///talercheck?host=/home/${USER}/sockets"}))
 
 SWITCHER_FACTORY = util.BuildFactory()
+SWITCHER_FACTORY.addStep(git_step(
+    'git://git.taler.net/deployment.git'))
 SWITCHER_FACTORY.addStep(ShellCommand(
     name="build",
     description="Building inactive blue-green party.",
diff --git a/taler-build/Makefile b/taler-build/Makefile
@@ -1,4 +1,4 @@
-all: exchange-stamp bank-stamp merchant-stamp gnunet-stamp donations-stamp blog-stamp landing-stamp auditor-stamp survey-stamp
+all: exchange-stamp bank-stamp merchant-stamp gnunet-stamp donations-stamp blog-stamp landing-stamp deployment-stamp auditor-stamp survey-stamp
 
 deployment-stamp:
 	./update_deployment.sh
diff --git a/taler-build/MakefileLint b/taler-build/MakefileLint
@@ -1,4 +1,4 @@
-all: bank-stamp donations-stamp survey-stamp blog-stamp
+all: bank-stamp donations-stamp survey-stamp blog-stamp deployment-stamp
 
 deployment-stamp:
 	./update_deployment.sh
diff --git a/taler-build/invalidate.sh b/taler-build/invalidate.sh
@@ -12,6 +12,6 @@ for component in  $components ; do
   git fetch
   if git status -sb | grep behind; then
     echo "invalidating $component"
-    rm -f $HOME/build_stamps/$component-stamp
+    rm -f $HOME/deployment/taler-build/$component-stamp
   fi
 done
diff --git a/taler-build/update_deployment.sh b/taler-build/update_deployment.sh
@@ -14,3 +14,4 @@ git fetch
 # reset to updated upstream branch, but only if we're tracking a branch
 branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null || echo HEAD)
 git reset --hard "$branch"
+