From e4173860f0a8b372a907290490ff659fd3e19c7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C8=98tefan=20Talpalaru?= <stefantalpalaru@yahoo.com>
Date: Thu, 21 May 2020 00:02:05 +0200
Subject: [PATCH] bump vendor/nimbus-build-system (#1050)

* bump vendor/nimbus-build-system

* Jenkins: switch to Bash for the "Build" stage
---
 Jenkinsfile                | 23 ++++++++++++++++-------
 vendor/nimbus-build-system |  2 +-
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 84f10c44f..ac7c86877 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -11,9 +11,12 @@ def runStages() {
 			[$class: "ArbitraryFileCache", excludes: "", includes: "**/*", path: "${WORKSPACE}/jsonTestsCache"]
 		]) {
 			stage("Build") {
-				sh "make -j${env.NPROC} update" /* to allow a newer Nim version to be detected */
-				sh "make -j${env.NPROC} deps" /* to allow the following parallel stages */
-				sh "V=1 ./scripts/setup_official_tests.sh jsonTestsCache"
+				sh """#!/bin/bash
+				set -e
+				make -j${env.NPROC} update # to allow a newer Nim version to be detected
+				make -j${env.NPROC} deps # to allow the following parallel stages
+				V=1 ./scripts/setup_official_tests.sh jsonTestsCache
+				"""
 			}
 		}
 
@@ -21,8 +24,11 @@ def runStages() {
 			parallel(
 				"tools": {
 					stage("Tools") {
-						sh "make -j${env.NPROC}"
-						sh "make -j${env.NPROC} LOG_LEVEL=TRACE NIMFLAGS='-d:testnet_servers_image'"
+						sh """#!/bin/bash
+						set -e
+						make -j${env.NPROC}
+						make -j${env.NPROC} LOG_LEVEL=TRACE NIMFLAGS='-d:testnet_servers_image'
+						"""
 					}
 				},
 				"test suite": {
@@ -32,8 +38,11 @@ def runStages() {
 					if ("${NODE_NAME}" ==~ /linux.*/) {
 						stage("testnet finalization") {
 							// EXECUTOR_NUMBER will be 0 or 1, since we have 2 executors per Jenkins node
-							sh "timeout -k 20s 10m ./scripts/launch_local_testnet.sh --testnet 0 --nodes 4 --log-level INFO --disable-htop --base-port \$(( 9000 + EXECUTOR_NUMBER * 100 )) --base-metrics-port \$(( 8008 + EXECUTOR_NUMBER * 100 )) -- --verify-finalization --stop-at-epoch=5"
-							sh "timeout -k 20s 40m ./scripts/launch_local_testnet.sh --testnet 1 --nodes 4 --log-level INFO --disable-htop --base-port \$(( 9000 + EXECUTOR_NUMBER * 100 )) --base-metrics-port \$(( 8008 + EXECUTOR_NUMBER * 100 )) -- --verify-finalization --stop-at-epoch=5"
+							sh """#!/bin/bash
+							set -e
+							timeout -k 20s 10m ./scripts/launch_local_testnet.sh --testnet 0 --nodes 4 --log-level INFO --disable-htop --base-port \$(( 9000 + EXECUTOR_NUMBER * 100 )) --base-metrics-port \$(( 8008 + EXECUTOR_NUMBER * 100 )) -- --verify-finalization --stop-at-epoch=5
+							timeout -k 20s 40m ./scripts/launch_local_testnet.sh --testnet 1 --nodes 4 --log-level INFO --disable-htop --base-port \$(( 9000 + EXECUTOR_NUMBER * 100 )) --base-metrics-port \$(( 8008 + EXECUTOR_NUMBER * 100 )) -- --verify-finalization --stop-at-epoch=5
+							"""
 						}
 					}
 				}
diff --git a/vendor/nimbus-build-system b/vendor/nimbus-build-system
index 1c9feb0d6..252af3e77 160000
--- a/vendor/nimbus-build-system
+++ b/vendor/nimbus-build-system
@@ -1 +1 @@
-Subproject commit 1c9feb0d66fbd8e55560543aee96d3e0d33c6c0f
+Subproject commit 252af3e779416c627158ba39b1df97cde51e5981