Change in simtrace2[master]: contrib/prepare_upload.sh: fix cd problems

osmith gerrit-no-reply at lists.osmocom.org
Mon Mar 8 07:39:02 UTC 2021


osmith has submitted this change. ( https://gerrit.osmocom.org/c/simtrace2/+/23265 )

Change subject: contrib/prepare_upload.sh: fix cd problems
......................................................................

contrib/prepare_upload.sh: fix cd problems

Call the script from the proper directory, and cd into the topdir on top
of the script. Fixes:
/build/contrib/jenkins.sh: line 71: contrib/prepare_upload.sh: No such file or directory

Related: OS#4413
Change-Id: Icbfaa5579aab887830ca90b24a2e322df8d98f4f
---
M contrib/jenkins.sh
M contrib/prepare_upload.sh
2 files changed, 3 insertions(+), 1 deletion(-)

Approvals:
  osmith: Looks good to me, approved; Verified



diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index 2ad7a7f..8268bcf 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -68,7 +68,7 @@
 if [ "x$publish" = "x--publish" ]; then
 	echo
 	echo "=============== UPLOAD BUILD  =============="
-	contrib/prepare_upload.sh
+	$TOPDIR/contrib/prepare_upload.sh
 
 	cat > "/build/known_hosts" <<EOF
 [rita.osmocom.org]:48 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDgQ9HntlpWNmh953a2Gc8NysKE4orOatVT1wQkyzhARnfYUerRuwyNr1GqMyBKdSI9amYVBXJIOUFcpV81niA7zQRUs66bpIMkE9/rHxBd81SkorEPOIS84W4vm3SZtuNqa+fADcqe88Hcb0ZdTzjKILuwi19gzrQyME2knHY71EOETe9Yow5RD2hTIpB5ecNxI0LUKDq+Ii8HfBvndPBIr0BWYDugckQ3Bocf+yn/tn2/GZieFEyFpBGF/MnLbAAfUKIdeyFRX7ufaiWWz5yKAfEhtziqdAGZaXNaLG6gkpy3EixOAy6ZXuTAk3b3Y0FUmDjhOHllbPmTOcKMry9
diff --git a/contrib/prepare_upload.sh b/contrib/prepare_upload.sh
index 8242fd4..90b3278 100755
--- a/contrib/prepare_upload.sh
+++ b/contrib/prepare_upload.sh
@@ -1,5 +1,7 @@
 #!/bin/sh -e
 # Create copies of binaries with -latest, -$GIT_VERSION (OS#4413, OS#3452)
+cd "$(dirname "$0")/.."
+
 GIT_VERSION="$(./git-version-gen .tarball-version)"
 
 echo "Copying binaries with "-latest" and "-$GIT_VERSION" appended..."

-- 
To view, visit https://gerrit.osmocom.org/c/simtrace2/+/23265
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: simtrace2
Gerrit-Branch: master
Gerrit-Change-Id: Icbfaa5579aab887830ca90b24a2e322df8d98f4f
Gerrit-Change-Number: 23265
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: osmith <osmith at sysmocom.de>
Gerrit-CC: Jenkins Builder
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210308/5de13e48/attachment.htm>


More information about the gerrit-log mailing list