From 4ef7b83fb8ee7fd0a4ff5193cf9b4935a45ce193 Mon Sep 17 00:00:00 2001 From: Croydon Date: Wed, 6 Dec 2017 18:27:34 +0100 Subject: [PATCH] fix(ci): CPack package has new name + location --- tool/travis.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tool/travis.sh b/tool/travis.sh index 9de9638e4..1316d6cea 100755 --- a/tool/travis.sh +++ b/tool/travis.sh @@ -89,12 +89,12 @@ build() { conan build "$gitroot" - # workaround that CPack sometimes fails on linux to copy the file to the final directory from the intermediate dir.. - local tempdir="/tmp/inexor-build/_CPack_Packages/Linux/ZIP/" - local zipname="Inexor-${last_tag}-Linux.zip" + # Moving the CPack package to the /inexor directory, so we are able to access it from outside of Docker + local tempdir="/tmp/inexor-build/" + local zipname="inexor-core-${last_tag}-Linux64.zip" local outputdir="/inexor/build/cpack/" mkdir -pv ${outputdir} - mv -f -v -u "${tempdir}${zipname}" "${outputdir}" || true + mv -f -v -u "${tempdir}${zipname}" "${outputdir}" ) }