simon/semantic-release
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'caribou' into greenkeeper-nock-8.0.0

Browse Source
This commit is contained in:
Stephan Bönnemann 2016-05-27 15:31:16 +02:00
commit 4807dee1e2
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bin/semantic-release.js
View File

@ -52,6 +52,7 @@ npmconf.load({}, function (err, conf) {
auth: { auth: {
token: env.NPM_TOKEN token: env.NPM_TOKEN
}, },
cafile: conf.get('cafile'),
loglevel: conf.get('loglevel'), loglevel: conf.get('loglevel'),
registry: require('../src/lib/get-registry')(pkg, conf), registry: require('../src/lib/get-registry')(pkg, conf),
tag: (pkg.publishConfig || {}).tag || conf.get('tag') || 'latest' tag: (pkg.publishConfig || {}).tag || conf.get('tag') || 'latest'
@ -159,6 +160,6 @@ npmconf.load({}, function (err, conf) {
log.verbose('post', (published ? 'Published' : 'Generated') + ' release notes.', release) log.verbose('post', (published ? 'Published' : 'Generated') + ' release notes.', release)
}) })
} else { } else {
log.error('post', 'Command "' + options.argv.remain[0] + '" not recognized. User either "pre" or "post"') log.error('post', 'Command "' + options.argv.remain[0] + '" not recognized. Use either "pre" or "post"')
} }
}) })

4
package.json
View File

@ -28,7 +28,7 @@
"npmconf": "^2.1.2", "npmconf": "^2.1.2",
"npmlog": "^2.0.0", "npmlog": "^2.0.0",
"require-relative": "^0.8.7", "require-relative": "^0.8.7",
"run-auto": "^1.1.2", "run-auto": "^2.0.0",
"run-series": "^1.1.3", "run-series": "^1.1.3",
"semver": "^5.0.3" "semver": "^5.0.3"
}, },
@ -42,7 +42,7 @@
"nyc": "^6.1.1", "nyc": "^6.1.1",
"proxyquire": "^1.7.3", "proxyquire": "^1.7.3",
"rimraf": "^2.5.0", "rimraf": "^2.5.0",
"standard": "^6.0.3", "standard": "^7.0.1",
"tap": "^5.0.0" "tap": "^5.0.0"
}, },
"engines": { "engines": {

4
src/pre.js
View File

@ -10,13 +10,13 @@ module.exports = function (config, cb) {
auto({ auto({
lastRelease: plugins.getLastRelease.bind(null, config), lastRelease: plugins.getLastRelease.bind(null, config),
commits: ['lastRelease', function (cb, results) { commits: ['lastRelease', function (results, cb) {
getCommits(_.assign({ getCommits(_.assign({
lastRelease: results.lastRelease lastRelease: results.lastRelease
}, config), }, config),
cb) cb)
}], }],
type: ['commits', 'lastRelease', function (cb, results) { type: ['commits', 'lastRelease', function (results, cb) {
getType(_.assign({ getType(_.assign({
commits: results.commits, commits: results.commits,
lastRelease: results.lastRelease lastRelease: results.lastRelease