From 3d51d689841c052803b06dadfd98eeb4615e45d4 Mon Sep 17 00:00:00 2001
From: Jamie Curnow <jc@jc21.com>
Date: Wed, 8 Mar 2023 12:37:45 +1000
Subject: [PATCH] test

---
 Jenkinsfile | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index f9b97586..49be03b3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -64,15 +64,13 @@ pipeline {
 			steps {
 				script {
 					def shStatusCode = 0
-					// Frontend
-					shStatusCode = sh(label: 'Checking and Building', returnStatus: true, script: './scripts/ci/frontend-build > ${WORKSPACE}/tmp-sh-frontend-build 2>&1')
-					shOutput = readFile "${env.WORKSPACE}/tmp-sh-frontend-build"
-					if (shStatusCode != 0) {
-						error "Error: ${shOutput}"
-					}
-					// Backend
-					shStatusCode = sh(label: 'Checking and Building', returnStatus: true, script: './scripts/ci/test-and-build > ${WORKSPACE}/tmp-sh-test-and-build 2>&1')
-					shOutput = readFile "${env.WORKSPACE}/tmp-sh-test-and-build"
+					// Frontend and Backend
+					shStatusCode = sh(label: 'Checking and Building', returnStatus: true, script: '''
+						set +x
+						./scripts/ci/frontend-build > ${WORKSPACE}/tmp-sh-build 2>&1
+						./scripts/ci/test-and-build > ${WORKSPACE}/tmp-sh-build 2>&1
+					''')
+					shOutput = readFile "${env.WORKSPACE}/tmp-sh-build"
 					if (shStatusCode != 0) {
 						error "Error: ${shOutput}"
 					}