deblan/php-censor
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of github.com:Block8/PHPCI

Browse source
This commit is contained in:
Dan Cryer 2014-04-24 16:25:31 +01:00
commit 70b47152cb
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
PHPCI/Plugin/CopyBuild.php
View file

@ -43,7 +43,7 @@ class CopyBuild implements \PHPCI\Plugin
return false;
}
$cmd = 'mkdir -p "%s" && ls -1a "%s"* | xargs -r -t "%s/"';
$cmd = 'mkdir -p "%s" && cp -R "%s" "%s"';
$success = $this->phpci->executeCommand($cmd, $this->directory, $build, $this->directory);
if ($this->ignore) {

4
public/assets/js/build-plugins/loc.js
View file

@ -47,7 +47,7 @@ var locPlugin = PHPCI.UiPlugin.extend({
var titles = ['Build', 'Lines', 'Comment Lines', 'Non-Comment Lines', 'Logical Lines'];
var data = [titles];
for (var i in builds) {
data.push(['Build ' + builds[i].build_id, parseInt(builds[i].meta_value.LOC), parseInt(builds[i].meta_value.CLOC), parseInt(builds[i].meta_value.NCLOC), parseInt(builds[i].meta_value.LLOC)]);
data.push(['#' + builds[i].build_id, parseInt(builds[i].meta_value.LOC), parseInt(builds[i].meta_value.CLOC), parseInt(builds[i].meta_value.NCLOC), parseInt(builds[i].meta_value.LLOC)]);
}
var data = google.visualization.arrayToDataTable(data);
@ -63,4 +63,4 @@ var locPlugin = PHPCI.UiPlugin.extend({
}
});
PHPCI.registerPlugin(new locPlugin());
PHPCI.registerPlugin(new locPlugin());

4
public/assets/js/build-plugins/warnings.js
View file

@ -87,8 +87,8 @@ var warningsPlugin = PHPCI.UiPlugin.extend({
var data = google.visualization.arrayToDataTable(data);
var options = {
hAxis: {title: 'Build'},
vAxis: {title: 'Warnings'},
hAxis: {title: 'Builds'},
vAxis: {title: 'Warnings / Errors'},
backgroundColor: { fill: 'transparent' },
height: 275,
pointSize: 3