Skip to content

Commit

Permalink
Merge pull request #104 from fson/error-exit-code
Browse files Browse the repository at this point in the history
Exit with the right status when build fails

Conflicts:
	lib/utils/build.js
  • Loading branch information
KyleAMathews committed Dec 20, 2015
2 parents b8d05e4 + c1d6de8 commit 2edae89
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 8 deletions.
7 changes: 5 additions & 2 deletions bin/build.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,8 @@ directory = path.resolve(relativeDirectory)
program.directory = directory
program.relativeDirectory = relativeDirectory

build(program)

build program, (err) ->
if err?
throw err
else
console.log('Done')
12 changes: 6 additions & 6 deletions lib/utils/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import buildProductionBundle from './build-production'
import postBuild from './post-build'
import globPages from './glob-pages'

module.exports = (program) => {
module.exports = (program, callback) => {
const directory = program.directory
let customPostBuild
try {
Expand All @@ -16,29 +16,29 @@ module.exports = (program) => {
return generateStaticPages(program, (err) => {
if (err) {
console.log('failed at generating static html pages')
return console.log(err)
return callback(err)
}
console.log('Compiling production bundle.js')
return buildProductionBundle(program, (e) => {
if (e) {
console.log('failed to compile bundle.js')
return console.log(e)
return callback(e)
}
console.log('Copying assets')
return postBuild(program, (error) => {
if (error) {
console.log('failed to copy assets')
return console.log(error)
return callback(error)
}
if ( (typeof customPostBuild !== 'undefined' && customPostBuild !== null) ) {
console.log('Performing custom post-build steps')
return globPages(directory, (globError, pages) => {
return customPostBuild(pages, (customPostBuildError) => {
if (customPostBuildError) {
console.log('customPostBuild function failed')
console.error(customPostBuildError)
callback(customPostBuildError)
}
return console.log('Done')
return callback(null)
})
})
}
Expand Down

0 comments on commit 2edae89

Please sign in to comment.