Sfoglia il codice sorgente

Merge branch 'master' of //172.16.0.27/repos/elxr

production
Pradeep Bhaskaran 4 anni fa
parent
commit
373bc42e32
2 ha cambiato i file con 52 aggiunte e 1 eliminazioni
  1. 50
    0
      index.js
  2. 2
    1
      package.json

+ 50
- 0
index.js Vedi File

@@ -17,6 +17,7 @@ const { spawn, spawnSync } = require('child_process');
const cliargs = require('../elxr/cliargs'); // Use minimist...
const processedArgs = cliargs(process.argv.slice(2));
console.dir(processedArgs)
var globSync = require('glob').sync;

var path = require('path');
const { isMaster } = require('cluster');
@@ -568,6 +569,55 @@ var __runcmd = function(label){
return p;
}
else return Promise.resolve(true);
},
, () => {
// Move test config from dev.
if(process.env.NODE_ENV === 'test'){
var devcfgreponame = runconfig.use + '-config' + '-development';
var testcfgreponame = runconfig.use + '-config' + '-test';

var testcfgdir = path.dirname(__dirname) + '/' + testcfgreponame + '/'
var devcfgdir = path.dirname(__dirname) + '/' + devcfgreponame + '/' //eg (elxr/../elixir-config.development)
var promises = [];

promises.push(
nodeShellExec('git', ['checkout', 'test'], {
inherit : true, shell: true,
cwd : testcfgdir
// , env: process.env
, runas : processedArgs.runas
, title : `git checkout ${testcfgreponame}`
}).catch((e)=>{ console.error(e) })
)
promises.push(
nodeShellExec('git', ['checkout', 'master'], {
inherit : true, shell: true,
cwd : devcfgdir
// , env: process.env
, runas : processedArgs.runas
, title : `git checkout ${devcfgreponame}`
}).catch((e)=>{ console.error(e) })
)

Promise.all(promises).then(()=> {
globSync( '**/*.test.js', {cwd : devcfgdir}).map((filename) => {

console.log('File found : ' + devcfgdir + filename)
fs.copyFileSync(devcfgdir + filename, testcfgdir+ filename);

nodeShellExec('git', ['checkout', 'test'], {
inherit : true, shell: true,
cwd : devcfgdir
// , env: process.env
, runas : processedArgs.runas
, title : `git checkout ${devcfgreponame}`
}).catch((e)=>{ console.error(e) })

})
})

}
}
];
runconfig.NODE_ENV = process.env.NODE_ENV = process.env.NODE_ENV || runconfig.NODE_ENV || 'development';

+ 2
- 1
package.json Vedi File

@@ -10,6 +10,7 @@
"author": "",
"license": "ISC",
"dependencies": {
"tree-kill": "^1.2.2"
"tree-kill": "^1.2.2",
"glob": "^7.1.2"
}
}

Loading…
Annulla
Salva