Skip to content
Snippets Groups Projects
Commit 7c17c666 authored by Rhys Arkins's avatar Rhys Arkins
Browse files

fix: better pin description in oboarding

parent 039ff55b
No related branches found
No related tags found
No related merge requests found
...@@ -16,6 +16,7 @@ async function renovateDockerImage(config) { ...@@ -16,6 +16,7 @@ async function renovateDockerImage(config) {
const upgrade = {}; const upgrade = {};
upgrade.newTag = config.currentTag; upgrade.newTag = config.currentTag;
upgrade.newDigest = newDigest; upgrade.newDigest = newDigest;
upgrade.newVersion = newDigest;
upgrade.newFrom = config.depName; upgrade.newFrom = config.depName;
if (upgrade.newTag) { if (upgrade.newTag) {
upgrade.newFrom += `:${upgrade.newTag}`; upgrade.newFrom += `:${upgrade.newTag}`;
......
...@@ -178,7 +178,11 @@ With your current configuration, renovate will initially create the following Pu ...@@ -178,7 +178,11 @@ With your current configuration, renovate will initially create the following Pu
} else { } else {
prDesc += upgrade.depName.replace(prTitleRe, '@​$1'); prDesc += upgrade.depName.replace(prTitleRe, '@​$1');
} }
prDesc += ` in \`${upgrade.depType}\` from \`${upgrade.currentVersion}\` to \`${upgrade.newVersion}\``; prDesc += ` in \`${upgrade.depType}\` `;
if (!upgrade.isPin) {
prDesc += `from \`${upgrade.currentVersion}\` `;
}
prDesc += `to \`${upgrade.newVersion}\``;
prDesc += '</li>'; prDesc += '</li>';
} }
}); });
......
...@@ -18,7 +18,7 @@ With your current configuration, renovate will initially create the following Pu ...@@ -18,7 +18,7 @@ With your current configuration, renovate will initially create the following Pu
| Pull Requests (2) | | Pull Requests (2) |
| ------ | | ------ |
| **Pin a**<ul><li>Branch name: \`branch-a\`</li><li>Pins [a](https://a) in \`undefined\` from \`^1.0.0\` to \`1.1.0\`</li></ul> | | **Pin a**<ul><li>Branch name: \`branch-a\`</li><li>Pins [a](https://a) in \`undefined\` to \`1.1.0\`</li></ul> |
| **Upgrade b**<ul><li>Schedule: \\"on monday\\"</li><li>Branch name: \`branch-b\`</li><li>Upgrades b in \`undefined\` from \`1.0.0\` to \`2.0.0\`</li></ul> | | **Upgrade b**<ul><li>Schedule: \\"on monday\\"</li><li>Branch name: \`branch-b\`</li><li>Upgrades b in \`undefined\` from \`1.0.0\` to \`2.0.0\`</li></ul> |
...@@ -202,7 +202,7 @@ With your current configuration, renovate will initially create the following Pu ...@@ -202,7 +202,7 @@ With your current configuration, renovate will initially create the following Pu
| Pull Requests (2) | | Pull Requests (2) |
| ------ | | ------ |
| **Pin a**<ul><li>Branch name: \`branch-a\`</li><li>Pins [a](https://a) in \`undefined\` from \`^1.0.0\` to \`1.1.0\`</li></ul> | | **Pin a**<ul><li>Branch name: \`branch-a\`</li><li>Pins [a](https://a) in \`undefined\` to \`1.1.0\`</li></ul> |
| **Upgrade b**<ul><li>Branch name: \`branch-b\`</li><li>Upgrades [b](https://b) in \`undefined\` from \`1.0.0\` to \`2.0.0\`</li></ul> | | **Upgrade b**<ul><li>Branch name: \`branch-b\`</li><li>Upgrades [b](https://b) in \`undefined\` from \`1.0.0\` to \`2.0.0\`</li></ul> |
...@@ -243,7 +243,7 @@ With your current configuration, renovate will initially create the following Pu ...@@ -243,7 +243,7 @@ With your current configuration, renovate will initially create the following Pu
| Pull Requests (1) | | Pull Requests (1) |
| ------ | | ------ |
| **Pin a**<ul><li>Branch name: \`branch-a\`</li><li>Pins [a](https://a) in \`undefined\` from \`^1.0.0\` to \`1.1.0\`</li><li>Upgrades [b](https://b) in \`undefined\` from \`1.0.0\` to \`2.0.0\`</li></ul> | | **Pin a**<ul><li>Branch name: \`branch-a\`</li><li>Pins [a](https://a) in \`undefined\` to \`1.1.0\`</li><li>Upgrades [b](https://b) in \`undefined\` from \`1.0.0\` to \`2.0.0\`</li></ul> |
Sometimes you may see multiple options for the same dependency (e.g. pinning in one branch and upgrading in another). This is expected and allows you the flexibility to choose which to merge first. Once you merge any PR, others will be updated or removed the next time Renovate runs. Sometimes you may see multiple options for the same dependency (e.g. pinning in one branch and upgrading in another). This is expected and allows you the flexibility to choose which to merge first. Once you merge any PR, others will be updated or removed the next time Renovate runs.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment