mirror of
https://gitlab.silvrtree.co.uk/martind2000/nci.git
synced 2025-02-11 09:59:16 +00:00
Merge branch 'master' of https://github.com/node-ci/nci
This commit is contained in:
commit
673c2bf2dd
@ -2,7 +2,12 @@ data
|
|||||||
.npmignore
|
.npmignore
|
||||||
test
|
test
|
||||||
static/css/**/*.less
|
static/css/**/*.less
|
||||||
static/js
|
#ignore all static/js except shared
|
||||||
|
static/js/app
|
||||||
|
static/js/libs
|
||||||
|
static/js/requirejs
|
||||||
|
static/js/templates
|
||||||
|
static/js/*.js
|
||||||
.bowerrc
|
.bowerrc
|
||||||
bower.json
|
bower.json
|
||||||
*.tgz
|
*.tgz
|
||||||
|
15
app.js
15
app.js
@ -143,13 +143,12 @@ Steppy(
|
|||||||
// path to root dir (with projects, builds etc)
|
// path to root dir (with projects, builds etc)
|
||||||
app.config.paths.data = path.join(process.cwd(), 'data');
|
app.config.paths.data = path.join(process.cwd(), 'data');
|
||||||
app.config.paths.projects = path.join(app.config.paths.data, 'projects');
|
app.config.paths.projects = path.join(app.config.paths.data, 'projects');
|
||||||
app.config.paths.builds = path.join(app.config.paths.data, 'builds');
|
|
||||||
app.config.paths.db = path.join(app.config.paths.data, 'db');
|
app.config.paths.db = path.join(app.config.paths.data, 'db');
|
||||||
app.config.paths.preload = path.join(app.config.paths.data, 'preload.json');
|
app.config.paths.preload = path.join(app.config.paths.data, 'preload.json');
|
||||||
|
|
||||||
var buildDirExistsCallback = this.slot();
|
var dbDirExistsCallback = this.slot();
|
||||||
fs.exists(app.config.paths.builds, function(isExists) {
|
fs.exists(app.config.paths.db, function(isExists) {
|
||||||
buildDirExistsCallback(null, isExists);
|
dbDirExistsCallback(null, isExists);
|
||||||
});
|
});
|
||||||
|
|
||||||
var preloadExistsCallback = this.slot();
|
var preloadExistsCallback = this.slot();
|
||||||
@ -157,11 +156,11 @@ Steppy(
|
|||||||
preloadExistsCallback(null, isExists);
|
preloadExistsCallback(null, isExists);
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
function(err, isBuildsDirExists, isPreloadExists) {
|
function(err, isDbDirExists, isPreloadExists) {
|
||||||
if (!isBuildsDirExists) {
|
if (isDbDirExists) {
|
||||||
fs.mkdir(app.config.paths.builds, this.slot());
|
|
||||||
} else {
|
|
||||||
this.pass(null);
|
this.pass(null);
|
||||||
|
} else {
|
||||||
|
fs.mkdir(app.config.paths.db, this.slot());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isPreloadExists) {
|
if (isPreloadExists) {
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "nci",
|
"name": "nci",
|
||||||
"version": "0.1.4",
|
"version": "0.2.1",
|
||||||
"description": "Continuous integration server written in node.js",
|
"description": "Continuous integration server written in node.js",
|
||||||
"bin": {
|
"bin": {
|
||||||
"nci": "bin/nci"
|
"nci": "bin/nci"
|
||||||
|
Loading…
Reference in New Issue
Block a user