Skip to content

Commit 03237d7

Browse files
committed
Merge branch 'master' into beta
2 parents f59d20c + 16edc0b commit 03237d7

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ language: node_js
33
node_js:
44
- 12
55
- 10
6-
- 8.15
6+
- 8.16
77

88
# Trigger a push build on release and greenkeeper branches + PRs build on every branches
99
# Avoid double build on PRs (See https://github.com/travis-ci/travis-ci/issues/1147)

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"aggregate-error": "^3.0.0",
2424
"debug": "^4.0.0",
2525
"dir-glob": "^3.0.0",
26-
"execa": "^3.0.0",
26+
"execa": "^3.2.0",
2727
"lodash": "^4.17.4",
2828
"micromatch": "^4.0.0",
2929
"p-reduce": "^2.0.0"
@@ -43,7 +43,7 @@
4343
"xo": "^0.25.2"
4444
},
4545
"engines": {
46-
"node": ">=8.15"
46+
"node": ">=8.16"
4747
},
4848
"files": [
4949
"lib",

test/helpers/git-utils.js

+5-3
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,11 @@ export async function gitCommits(messages, execaOpts) {
7878
*/
7979
export async function gitGetCommits(from, execaOpts) {
8080
Object.assign(gitLogParser.fields, {hash: 'H', message: 'B', gitTags: 'd', committerDate: {key: 'ci', type: Date}});
81-
return (await getStream.array(
82-
gitLogParser.parse({_: `${from ? from + '..' : ''}HEAD`}, {...execaOpts, env: {...process.env, ...execaOpts.env}})
83-
)).map(commit => {
81+
return (
82+
await getStream.array(
83+
gitLogParser.parse({_: `${from ? from + '..' : ''}HEAD`}, {...execaOpts, env: {...process.env, ...execaOpts.env}})
84+
)
85+
).map(commit => {
8486
commit.message = commit.message.trim();
8587
commit.gitTags = commit.gitTags.trim();
8688
return commit;

test/prepare.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ test('Exclude CHANGELOG.md, package.json, package-lock.json, and npm-shrinkwrap.
6464
t.deepEqual(await gitCommitedFiles('HEAD', {cwd, env}), []);
6565
});
6666

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

0 commit comments

Comments
 (0)