[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-deployment] branch master updated: reverting to old
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-deployment] branch master updated: reverting to old style |
Date: |
Mon, 27 Nov 2017 12:20:50 +0100 |
This is an automated email from the git hooks/post-receive script.
marcello pushed a commit to branch master
in repository deployment.
The following commit(s) were added to refs/heads/master by this push:
new ed827ce reverting to old style
ed827ce is described below
commit ed827ce1bc7bd65d477c87d9b01a3b77c44f9526
Author: Marcello Stanisci <address@hidden>
AuthorDate: Mon Nov 27 12:20:38 2017 +0100
reverting to old style
---
bin/taler-deployment-build | 11 ++++-------
buildbot/master.cfg | 6 ++++++
taler-build/Makefile | 2 +-
taler-build/MakefileLint | 2 +-
taler-build/invalidate.sh | 2 +-
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
index fc8d923..08f7890 100755
--- 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
index 710f888..adac28a 100644
--- 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
index 621af05..3d1a0fb 100644
--- 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
index 96b71a9..4dc1bb0 100644
--- 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
index cbe4d4e..46a36b5 100755
--- 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
index 8ec21d7..c3ebe4a 100755
--- 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"
+
--
To stop receiving notification emails like this one, please contact
address@hidden
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [taler-deployment] branch master updated: reverting to old style,
gnunet <=