Skip to content

Commit

Permalink
Merge branch 'master' into beta
Browse files Browse the repository at this point in the history
  • Loading branch information
pvdlg committed Nov 21, 2019
2 parents f59d20c + 16edc0b commit 03237d7
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -3,7 +3,7 @@ language: node_js
node_js:
- 12
- 10
- 8.15
- 8.16

# Trigger a push build on release and greenkeeper branches + PRs build on every branches
# Avoid double build on PRs (See https://github.com/travis-ci/travis-ci/issues/1147)
Expand Down
4 changes: 2 additions & 2 deletions package.json
Expand Up @@ -23,7 +23,7 @@
"aggregate-error": "^3.0.0",
"debug": "^4.0.0",
"dir-glob": "^3.0.0",
"execa": "^3.0.0",
"execa": "^3.2.0",
"lodash": "^4.17.4",
"micromatch": "^4.0.0",
"p-reduce": "^2.0.0"
Expand All @@ -43,7 +43,7 @@
"xo": "^0.25.2"
},
"engines": {
"node": ">=8.15"
"node": ">=8.16"
},
"files": [
"lib",
Expand Down
8 changes: 5 additions & 3 deletions test/helpers/git-utils.js
Expand Up @@ -78,9 +78,11 @@ export async function gitCommits(messages, execaOpts) {
*/
export async function gitGetCommits(from, execaOpts) {
Object.assign(gitLogParser.fields, {hash: 'H', message: 'B', gitTags: 'd', committerDate: {key: 'ci', type: Date}});
return (await getStream.array(
gitLogParser.parse({_: `${from ? from + '..' : ''}HEAD`}, {...execaOpts, env: {...process.env, ...execaOpts.env}})
)).map(commit => {
return (
await getStream.array(
gitLogParser.parse({_: `${from ? from + '..' : ''}HEAD`}, {...execaOpts, env: {...process.env, ...execaOpts.env}})
)
).map(commit => {
commit.message = commit.message.trim();
commit.gitTags = commit.gitTags.trim();
return commit;
Expand Down
2 changes: 1 addition & 1 deletion test/prepare.test.js
Expand Up @@ -64,7 +64,7 @@ test('Exclude CHANGELOG.md, package.json, package-lock.json, and npm-shrinkwrap.
t.deepEqual(await gitCommitedFiles('HEAD', {cwd, env}), []);
});

test.serial('Allow to customize the commit message', async t => {
test('Allow to customize the commit message', async t => {
const {cwd, repositoryUrl} = await gitRepo(true);
const pluginConfig = {
message: `Release version \${nextRelease.version} from branch \${branch}
Expand Down

0 comments on commit 03237d7

Please sign in to comment.