summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2016-03-03 19:14:02 +0000
committerRichard van der Hoff <richard@matrix.org>2016-03-03 19:14:02 +0000
commit361fc53917cfe29549a6b678bbfefc07b94bd518 (patch)
tree7f9c37afab5515c7ac67ac91ac86da1f6db398b0
parentMerge remote-tracking branch 'origin/develop' into rav/SYN-642 (diff)
parentjenkins-*.sh: set -x (diff)
downloadsynapse-361fc53917cfe29549a6b678bbfefc07b94bd518.tar.xz
Merge branch 'develop' into rav/SYN-642
-rwxr-xr-xjenkins-flake8.sh4
-rwxr-xr-xjenkins-postgres.sh4
-rwxr-xr-xjenkins-sqlite.sh4
-rwxr-xr-xjenkins-unittests.sh4
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)"}