[sysadmin/ci-tooling] pipeline-templates: Ensure that Groovy passes the shell script through to the shell interpreter for evaluation.

Ben Cooksley null at kde.org
Sat Nov 3 03:14:50 GMT 2018


Git commit 88415288d6803f28f413a67233185ed9698ceeb9 by Ben Cooksley.
Committed on 03/11/2018 at 03:14.
Pushed by bcooksley into branch 'master'.

Ensure that Groovy passes the shell script through to the shell interpreter for evaluation.

CCMAIL: kde-frameworks-devel at kde.org

M  +5    -5    pipeline-templates/AndroidQt5.11.template

https://commits.kde.org/sysadmin/ci-tooling/88415288d6803f28f413a67233185ed9698ceeb9

diff --git a/pipeline-templates/AndroidQt5.11.template b/pipeline-templates/AndroidQt5.11.template
index 3df926f..17d21da 100644
--- a/pipeline-templates/AndroidQt5.11.template
+++ b/pipeline-templates/AndroidQt5.11.template
@@ -61,14 +61,14 @@ timestamps {
 			sh """
 				systemDependencies=`python3 ci-tooling/helpers/getsetting.py --product ${productName} --project ${projectName} --platform ${currentPlatform} --key externalDependencies`
 
-				export DESTDIR=INSTALL_ROOT='$WORKSPACE/install-divert/'
-				export APP_INSTALL_PREFIX='$HOME/install-prefix/'
+				export DESTDIR=INSTALL_ROOT='\$WORKSPACE/install-divert/'
+				export APP_INSTALL_PREFIX='\$HOME/install-prefix/'
 
-				mkdir -p '$DESTDIR/$APP_INSTALL_PREFIX/'
+				mkdir -p '\$DESTDIR/\$APP_INSTALL_PREFIX/'
 
-				$systemDependencies
+				\$systemDependencies
 
-				rsync -Ha '$DESTDIR/$APP_INSTALL_PREFIX/' '$APP_INSTALL_PREFIX/'
+				rsync -Ha '\$DESTDIR/\$APP_INSTALL_PREFIX/' '\$APP_INSTALL_PREFIX/'
 			"""
 		}
 


More information about the Kde-frameworks-devel mailing list