diff options
author | Richard van der Hoff <richard@matrix.org> | 2016-03-03 19:14:02 +0000 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2016-03-03 19:14:02 +0000 |
commit | 361fc53917cfe29549a6b678bbfefc07b94bd518 (patch) | |
tree | 7f9c37afab5515c7ac67ac91ac86da1f6db398b0 | |
parent | Merge remote-tracking branch 'origin/develop' into rav/SYN-642 (diff) | |
parent | jenkins-*.sh: set -x (diff) | |
download | synapse-361fc53917cfe29549a6b678bbfefc07b94bd518.tar.xz |
Merge branch 'develop' into rav/SYN-642
-rwxr-xr-x | jenkins-flake8.sh | 4 | ||||
-rwxr-xr-x | jenkins-postgres.sh | 4 | ||||
-rwxr-xr-x | jenkins-sqlite.sh | 4 | ||||
-rwxr-xr-x | jenkins-unittests.sh | 4 |
4 files changed, 12 insertions, 4 deletions
diff --git a/jenkins-flake8.sh b/jenkins-flake8.sh index cbcb0ae4c0..11f1cab6c8 100755 --- a/jenkins-flake8.sh +++ b/jenkins-flake8.sh @@ -1,4 +1,6 @@ -#!/bin/bash -eu +#!/bin/bash + +set -eux : ${WORKSPACE:="$(pwd)"} diff --git a/jenkins-postgres.sh b/jenkins-postgres.sh index 1708cbfaaa..d1fed590a2 100755 --- a/jenkins-postgres.sh +++ b/jenkins-postgres.sh @@ -1,4 +1,6 @@ -#!/bin/bash -eu +#!/bin/bash + +set -eux : ${WORKSPACE:="$(pwd)"} diff --git a/jenkins-sqlite.sh b/jenkins-sqlite.sh index 2d98a0af93..57fd8de54d 100755 --- a/jenkins-sqlite.sh +++ b/jenkins-sqlite.sh @@ -1,4 +1,6 @@ -#!/bin/bash -eu +#!/bin/bash + +set -eux : ${WORKSPACE:="$(pwd)"} diff --git a/jenkins-unittests.sh b/jenkins-unittests.sh index 2fa2f1b1de..104d511994 100755 --- a/jenkins-unittests.sh +++ b/jenkins-unittests.sh @@ -1,4 +1,6 @@ -#!/bin/bash -eu +#!/bin/bash + +set -eux : ${WORKSPACE:="$(pwd)"} |