Parcourir la source

Better bamboo detection (use BAMBOO_ISNTALL env var rather than requiring a custom env var IS_BAMBOO)

DoReports.sh will now symlink build and reports from the main checkout to its current dir on startup so that bamboo can find the results


git-svn-id: http://svn.dmdirc.com/trunk@3942 00569f92-eb28-0410-84fd-f71c24880f
tags/0.6
Shane Mc Cormack il y a 16 ans
Parent
révision
12d15bdcf6
2 fichiers modifiés avec 12 ajouts et 1 suppressions
  1. 1
    1
      BuildAll.sh
  2. 11
    0
      DoReports.sh

+ 1
- 1
BuildAll.sh Voir le fichier

@@ -80,7 +80,7 @@ done;
80 80
 
81 81
 PHP=`which php`
82 82
 
83
-if [ "${IS_BAMBOO}" != "" -a -e "${BAMBOO}" ]; then
83
+if [ "${BAMBOO_INSTALL}" != "" -a -e "${BAMBOO}" ]; then
84 84
 	export BAMBOO_DIR=${BAMBOO};
85 85
 	export BAMBOO_BUILD=`ls -1 ${BAMBOO} | tail -n 1 | awk -F. '{print $1}'`
86 86
 	echo "This is Bamboo Build: "${BAMBOO_BUILD};

+ 11
- 0
DoReports.sh Voir le fichier

@@ -19,6 +19,17 @@ SVN="/usr/bin/svn"
19 19
 # Increase the memory allowed to be used when running stuff
20 20
 export ANT_OPTS=-Xmx512m
21 21
 
22
+if [ "${BAMBOO_INSTALL}" != "" ]; then
23
+	# Running as bamboo, symlink/create needed things to let it find the results
24
+	# of the build
25
+	if [ ! -e ${PWD}/reports ]; then
26
+		ln -s ${MYDIR}/reports
27
+	fi;
28
+	if [ ! -e ${PWD}/build ]; then
29
+		ln -s ${MYDIR}/build
30
+	fi;
31
+fi;
32
+
22 33
 #/bin/sh $MYDIR/oblong.sh "Reports" "Style Report Generation Started";
23 34
 cd $MYDIR
24 35
 $SVN update

Chargement…
Annuler
Enregistrer