diff options
| author | Marcello Stanisci <stanisci.m@gmail.com> | 2017-11-27 12:17:49 +0100 |
|---|---|---|
| committer | Marcello Stanisci <stanisci.m@gmail.com> | 2017-11-27 12:17:49 +0100 |
| commit | c1c13d4863de56c5dd9114bd59e2339e78b1574d (patch) | |
| tree | 755bb36fe34ef26c6d32c4423bd6b50bcf898ae0 | |
| parent | 41f48c26512c088a08f04d73c416336ab3b41406 (diff) | |
| download | deployment-c1c13d4863de56c5dd9114bd59e2339e78b1574d.tar.gz deployment-c1c13d4863de56c5dd9114bd59e2339e78b1574d.tar.bz2 deployment-c1c13d4863de56c5dd9114bd59e2339e78b1574d.zip | |
trying with a separate directory for build stamps
| -rwxr-xr-x | bin/taler-deployment-build | 11 | ||||
| -rw-r--r-- | buildbot/master.cfg | 6 | ||||
| -rwxr-xr-x | taler-build/invalidate.sh | 2 |
3 files changed, 8 insertions, 11 deletions
diff --git a/bin/taler-deployment-build b/bin/taler-deployment-build index 08f7890..fc8d923 100755 --- a/bin/taler-deployment-build +++ b/bin/taler-deployment-build @@ -20,11 +20,14 @@ fi source $HOME/activate -cd $HOME/deployment/taler-build -./invalidate.sh +# Check changes +$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 adac28a..710f888 100644 --- a/buildbot/master.cfg +++ b/buildbot/master.cfg @@ -161,8 +161,6 @@ 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", @@ -177,8 +175,6 @@ 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", @@ -195,8 +191,6 @@ 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/invalidate.sh b/taler-build/invalidate.sh index 46a36b5..cbe4d4e 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/deployment/taler-build/$component-stamp + rm -f $HOME/build_stamps/$component-stamp fi done |