From e683e3eb8a748057281a2a0650bd1a4742299c97 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Tue, 26 May 2020 13:07:20 +0200 Subject: scripts: source common.sh before cd common.sh tries to set OSMO_CI_DIR now; however this does not work when common.sh was sourced with ". ./common.sh": realpath: scripts/..: No such file or directory Fixes: 7cb8e2d0 ("OBS: add debian10 specific patch for limesuite") Related: https://jenkins.osmocom.org/jenkins/job/Osmocom-build-tags-against-master/455/console Change-Id: Ib326eb0fa769528398335c9cf06dc9c9576c882e --- scripts/osmocom-build-old-tags-against-master.sh | 2 +- scripts/osmocom-release-tarballs.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/osmocom-build-old-tags-against-master.sh b/scripts/osmocom-build-old-tags-against-master.sh index 58a0009..e7e6bff 100755 --- a/scripts/osmocom-build-old-tags-against-master.sh +++ b/scripts/osmocom-build-old-tags-against-master.sh @@ -7,8 +7,8 @@ # Latest result: # https://jenkins.osmocom.org/jenkins/job/Osmocom-build-tags-against-master/lastBuild/console +. "$(dirname "$0")/common.sh" cd "$(dirname "$0")" -. ./common.sh ERROR_LOGS="" PARALLEL_MAKE="${PARALLEL_MAKE:--j5}" diff --git a/scripts/osmocom-release-tarballs.sh b/scripts/osmocom-release-tarballs.sh index b9d21c3..3f8b920 100755 --- a/scripts/osmocom-release-tarballs.sh +++ b/scripts/osmocom-release-tarballs.sh @@ -7,8 +7,8 @@ # * KEEP_TEMP: do not delete cloned repositories (use for development) # * PARALLEL_MAKE: -jN argument for make (default: -j5). +. "$(dirname "$0")/common.sh" cd "$(dirname "$0")" -. ./common.sh PARALLEL_MAKE="${PARALLEL_MAKE:--j5}" OUTPUT="$(cd ..; pwd)/_release_tarballs" TEMP="$(cd ..; pwd)/_temp" -- cgit v1.2.3