diff options
| author | Sven Gothel <[email protected]> | 2012-02-27 22:08:04 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2012-02-27 22:08:04 +0100 |
| commit | 191726a29dbfeab111d1a55ca32ce83055ebbb6a (patch) | |
| tree | 366e66c4f079004ee473503306d40963f3917c70 /jenkins-builds | |
| parent | e833143af594ed0e3c1f966af56e4970b1318fe8 (diff) | |
Add linux-armv7 to aggreagtion ; Clip os.and.arch from demo folder within 7z
Diffstat (limited to 'jenkins-builds')
| -rwxr-xr-x | jenkins-builds/funcs_promotion.sh | 8 | ||||
| -rwxr-xr-x | jenkins-builds/promote-latest-builds.sh | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/jenkins-builds/funcs_promotion.sh b/jenkins-builds/funcs_promotion.sh index 87b780c..840391a 100755 --- a/jenkins-builds/funcs_promotion.sh +++ b/jenkins-builds/funcs_promotion.sh @@ -281,13 +281,13 @@ function prom_promote_demos() { echo "ERROR: No 7z file for module $module, sdir $sourcedir" exit 1 fi - cp -av $sfile $zfile local sfolder=`basename $sfile .7z` - local zfolder=`basename $zfile .7z` - echo "INFO: extract $module - $zfile -> tmp/$zfolder" + local zfolder=$module + echo "INFO: extract $module - $sfile -> tmp/$zfolder" cd tmp - prom_extract ../$zfile $sfolder + prom_extract ../$sfile $sfolder mv -v $sfolder $zfolder + 7z a -r ../$zfile $zfolder cd .. if $fromslave ; then prom_verify_artifacts $module log/$module.artifact.properties tmp/$zfolder/artifact.properties diff --git a/jenkins-builds/promote-latest-builds.sh b/jenkins-builds/promote-latest-builds.sh index 677cf9e..adb21e6 100755 --- a/jenkins-builds/promote-latest-builds.sh +++ b/jenkins-builds/promote-latest-builds.sh @@ -34,7 +34,7 @@ logfile=$thisdir/`basename $0 .sh`.log archivedir=/srv/www/jogamp.org/deployment/archive/$branch rootdir=/srv/www/jogamp.org/deployment/autobuilds/$branch -os_and_archs_minus_one="linux-i586 macosx-universal windows-amd64 windows-i586 solaris-i586 solaris-amd64" +os_and_archs_minus_one="linux-i586 linux-armv7 macosx-universal windows-amd64 windows-i586 solaris-i586 solaris-amd64" masterpick="linux-amd64" os_and_archs="$masterpick $os_and_archs_minus_one" |