update async functions
This commit is contained in:
@@ -1,49 +1,32 @@
|
||||
import * as plugins from './npmci.plugins'
|
||||
import {bash} from './npmci.bash'
|
||||
import {install} from './npmci.install'
|
||||
import { bash } from './npmci.bash'
|
||||
import { install } from './npmci.install'
|
||||
import * as env from './npmci.env'
|
||||
import * as NpmciBuildDocker from './npmci.build.docker'
|
||||
|
||||
export let test = (versionArg) => {
|
||||
let done = plugins.q.defer()
|
||||
if (versionArg === 'docker') {
|
||||
testDocker()
|
||||
.then(() => {
|
||||
done.resolve()
|
||||
})
|
||||
} else {
|
||||
install(versionArg)
|
||||
.then(npmDependencies)
|
||||
.then(npmTest)
|
||||
.then(() => {
|
||||
done.resolve()
|
||||
})
|
||||
}
|
||||
return done.promise
|
||||
export let test = async (versionArg): Promise<void> => {
|
||||
if (versionArg === 'docker') {
|
||||
await testDocker()
|
||||
} else {
|
||||
await install(versionArg)
|
||||
.then(npmDependencies)
|
||||
.then(npmTest)
|
||||
}
|
||||
}
|
||||
|
||||
let npmDependencies = function(){
|
||||
let done = plugins.q.defer()
|
||||
plugins.beautylog.info('now installing dependencies:')
|
||||
bash('npm install')
|
||||
done.resolve()
|
||||
return done.promise
|
||||
let npmDependencies = async () => {
|
||||
plugins.beautylog.info('now installing dependencies:')
|
||||
await bash('npm install')
|
||||
}
|
||||
|
||||
let npmTest = () => {
|
||||
let done = plugins.q.defer()
|
||||
plugins.beautylog.info('now starting tests:')
|
||||
bash('npm test')
|
||||
done.resolve()
|
||||
return done.promise
|
||||
let npmTest = async () => {
|
||||
plugins.beautylog.info('now starting tests:')
|
||||
await bash('npm test')
|
||||
}
|
||||
|
||||
let testDocker = function(){
|
||||
let done = plugins.q.defer()
|
||||
NpmciBuildDocker.readDockerfiles()
|
||||
.then(NpmciBuildDocker.pullDockerfileImages)
|
||||
.then(NpmciBuildDocker.testDockerfiles)
|
||||
.then(done.resolve)
|
||||
return done.promise
|
||||
let testDocker = async (): Promise<NpmciBuildDocker.Dockerfile[]> => {
|
||||
return await NpmciBuildDocker.readDockerfiles()
|
||||
.then(NpmciBuildDocker.pullDockerfileImages)
|
||||
.then(NpmciBuildDocker.testDockerfiles)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user