File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 11name : Plugwise differences
22
33env :
4- CACHE_VERSION : 1
4+ CACHE_VERSION : 2
55
66on :
77 schedule :
Original file line number Diff line number Diff line change @@ -19,7 +19,7 @@ cd "${clonedir}" || exit
1919echo " " > " ${difffile} "
2020diff -X " ${pdir} /ignorelist.txt" " ${coredir} /" " ${betadir} /" >> " ${difffile} "
2121
22- diff2html -F " ${pdir} /diff.html" " ${difffile} " || exit 1
22+ diff2html -s " side " - F " ${pdir} /diff.html" " ${difffile} " || exit 1
2323
2424echo " <html>
2525 <head>
4848 echo " " > " ${difffile} "
4949 diff -X " ${pdir} /ignorelist.txt" " ${betadir} /" " ${coredir} /" >> " ${difffile} "
5050
51- diff2html -F " ${pdir} /diff_${betabranchname} .html" " ${difffile} "
51+ diff2html -s " side " - F " ${pdir} /diff_${betabranchname} .html" " ${difffile} "
5252
5353 echo "
5454 <li><a href='diff_${betabranchname} .html'>Unified diff core:dev vs ${1} :${betabranch} </a></li>" >> " ${pdir} /index.html"
7373 echo " " > " ${difffile} "
7474 diff -X " ${pdir} /ignorelist.txt" " ${coredir} /" " ${prdir} /" >> " ${difffile} "
7575
76- diff2html -F " ${pdir} /diff_${prbranch} .html" " ${difffile} "
76+ diff2html -s " side " - F " ${pdir} /diff_${prbranch} .html" " ${difffile} "
7777
7878 justprbranch=${prbranch// ^plugwise-/ }
7979 echo "
105105 echo " " > " ${difffile} "
106106 diff -X " ${pdir} /ignorelist.txt" " ${bmdir} /" " ${prdir} /" >> " ${difffile} "
107107
108- diff2html -F " ${pdir} /bm_diff_${prbranch} .html" " ${difffile} "
108+ diff2html -s " side " - F " ${pdir} /bm_diff_${prbranch} .html" " ${difffile} "
109109
110110 justprbranch=${prbranch// ^plugwise-/ }
111111 echo "
You can’t perform that action at this time.
0 commit comments