From d6e7fe64773ca60e93bfd98ceb60fbe24a05f9a2 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Mon, 24 Sep 2018 22:19:33 +0200
Subject: [PATCH] fix(pr): correct minor -> patch
---
lib/workers/pr/pr-body.js | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/lib/workers/pr/pr-body.js b/lib/workers/pr/pr-body.js
index 540b579ca9..4211d038d5 100644
--- a/lib/workers/pr/pr-body.js
+++ b/lib/workers/pr/pr-body.js
@@ -2,6 +2,8 @@ const is = require('@sindresorhus/is');
const handlebars = require('handlebars');
const releaseNotesHbs = require('./changelog/hbs-template');
+const versioning = require('../../versioning');
+
handlebars.registerHelper('encodeURIComponent', encodeURIComponent);
module.exports = {
@@ -47,7 +49,24 @@ async function getPrBody(config) {
references.push(`[changelog](${changelogUrl})`);
}
upgrade.references = references.join(', ');
- const { newValue, newDigestShort, updateType } = upgrade;
+ const {
+ currentValue,
+ newValue,
+ newDigestShort,
+ updateType,
+ versionScheme,
+ } = upgrade;
+ // istanbul ignore if
+ if (updateType === 'minor') {
+ try {
+ const { getMinor } = versioning(versionScheme);
+ if (getMinor(currentValue) === getMinor(newValue)) {
+ upgrade.updateType = 'patch';
+ }
+ } catch (err) {
+ // do nothing
+ }
+ }
if (newDigestShort) {
if (updateType === 'pin') {
upgrade.newValue = config.newDigestShort;
--
GitLab