From 3465ea7e4287994e40b0f63b6a2e50bda77e9ad9 Mon Sep 17 00:00:00 2001 From: Rhys Arkins <rhys@arkins.net> Date: Thu, 4 Jul 2019 16:08:18 +0200 Subject: [PATCH] fix: Revert "refactor: replace emoji shortcodes with their unicode equivalent (#4000)" This reverts commit 69566652e49dc97d24da516e7f3384dbcfa0f2e5. --- lib/workers/branch/index.js | 8 +-- lib/workers/pr/pr-body-config.js | 10 ++-- lib/workers/pr/pr-body.js | 6 +-- .../onboarding/pr/config-description.js | 2 +- .../onboarding/pr/errors-warnings.js | 2 +- lib/workers/repository/onboarding/pr/index.js | 10 ++-- .../repository/onboarding/pr/pr-list.js | 2 +- .../pr/__snapshots__/index.spec.js.snap | 54 +++++++++---------- .../config-description.spec.js.snap | 6 +-- .../errors-warnings.spec.js.snap | 2 +- .../pr/__snapshots__/pr-list.spec.js.snap | 2 +- 11 files changed, 52 insertions(+), 52 deletions(-) diff --git a/lib/workers/branch/index.js b/lib/workers/branch/index.js index cc3bc071fc..fa81300122 100644 --- a/lib/workers/branch/index.js +++ b/lib/workers/branch/index.js @@ -130,7 +130,7 @@ async function processBranch(branchConfig, prHourlyLimitReached, packageFiles) { await platform.ensureCommentRemoval(branchPr.number, subject); } } else { - let content = `š· This PR has received other commits, so ${appName} will stop updating it to avoid conflicts or other problems.`; + let content = `:construction_worker: This PR has received other commits, so ${appName} will stop updating it to avoid conflicts or other problems.`; content += ` If you wish to abandon your changes and have ${appName} start over you may click the "rebase" checkbox in the PR body/description.`; if (!config.suppressNotifications.includes('prEditNotification')) { if (config.dryRun) { @@ -364,7 +364,7 @@ async function processBranch(branchConfig, prHourlyLimitReached, packageFiles) { const pr = await prWorker.ensurePr(config); // TODO: ensurePr should check for automerge itself if (pr) { - const topic = 'ā ļø Artifact update problem'; + const topic = ':warning: Artifact update problem'; if (config.artifactErrors && config.artifactErrors.length) { logger.warn( { artifactErrors: config.artifactErrors }, @@ -375,7 +375,7 @@ async function processBranch(branchConfig, prHourlyLimitReached, packageFiles) { config.artifactErrors.length > 1 ? 'artifacts' : 'an artifact'; content += ' related to this branch. You probably do not want to merge this PR as-is.'; - content += `\n\nā»ļø ${appName} will retry this branch, including artifacts, only when one of the following happens:\n\n`; + content += `\n\n:recycle: ${appName} will retry this branch, including artifacts, only when one of the following happens:\n\n`; content += ' - any of the package files in this branch needs updating, or \n'; content += ' - the branch becomes conflicted, or\n'; @@ -404,7 +404,7 @@ async function processBranch(branchConfig, prHourlyLimitReached, packageFiles) { // TODO: remoe this soon once they're all cleared out await platform.ensureCommentRemoval( pr.number, - 'ā ļø Lock file problem' + ':warning: Lock file problem' ); } } diff --git a/lib/workers/pr/pr-body-config.js b/lib/workers/pr/pr-body-config.js index d6ea826f2e..649cf01b1b 100644 --- a/lib/workers/pr/pr-body-config.js +++ b/lib/workers/pr/pr-body-config.js @@ -6,7 +6,7 @@ module.exports = { async function getPrConfigDescription(config) { let prBody = `\n\n---\n\n### ${appName} configuration\n\n`; - prBody += `š **Schedule**: `; + prBody += `:date: **Schedule**: `; if ( config.schedule && config.schedule !== 'at any time' && @@ -23,7 +23,7 @@ async function getPrConfigDescription(config) { } prBody += '\n\n'; - prBody += 'š¦ **Automerge**: '; + prBody += ':vertical_traffic_light: **Automerge**: '; if (config.automerge) { const branchStatus = await platform.getBranchStatus( config.branchName, @@ -40,7 +40,7 @@ async function getPrConfigDescription(config) { 'Disabled by config. Please merge this manually once you are satisfied.'; } prBody += '\n\n'; - prBody += 'ā»ļø **Rebasing**: '; + prBody += ':recycle: **Rebasing**: '; if (config.rebaseStalePrs) { prBody += 'Whenever PR is stale'; } else { @@ -52,9 +52,9 @@ async function getPrConfigDescription(config) { prBody += '.\n\n'; } if (config.recreateClosed) { - prBody += `š» **Immortal**: This PR will be recreated if closed unmerged. Get [config help](${urls.help}) if that's undesired.\n\n`; + prBody += `:ghost: **Immortal**: This PR will be recreated if closed unmerged. Get [config help](${urls.help}) if that's undesired.\n\n`; } else { - prBody += `š **Ignore**: Close this PR and you won't be reminded about ${ + prBody += `:no_bell: **Ignore**: Close this PR and you won't be reminded about ${ config.upgrades.length === 1 ? 'this update' : 'these updates' } again.\n\n`; } diff --git a/lib/workers/pr/pr-body.js b/lib/workers/pr/pr-body.js index 3269eeaa5a..fdd3b7211c 100644 --- a/lib/workers/pr/pr-body.js +++ b/lib/workers/pr/pr-body.js @@ -154,16 +154,16 @@ async function getPrBody(config) { if (config.upgrades.some(upgrade => upgrade.gitRef)) { prBody += - 'š” If you wish to disable git hash updates, add `":disableDigestUpdates"` to the extends array in your config.\n\n'; + ':abcd: If you wish to disable git hash updates, add `":disableDigestUpdates"` to the extends array in your config.\n\n'; } if (config.updateType === 'lockFileMaintenance') { prBody += - 'š§ This Pull Request updates lock files to use the latest dependency versions.\n\n'; + ':wrench: This Pull Request updates lock files to use the latest dependency versions.\n\n'; } if (config.isPin) { - prBody += `š **Important**: ${appName} will wait until you have merged this Pin PR before creating any *upgrade* PRs for the affected packages. Add the preset \`:preserveSemverRanges\` your config if you instead don't wish to pin dependencies.\n\n`; + prBody += `:pushpin: **Important**: ${appName} will wait until you have merged this Pin PR before creating any *upgrade* PRs for the affected packages. Add the preset \`:preserveSemverRanges\` your config if you instead don't wish to pin dependencies.\n\n`; } if (config.hasReleaseNotes) { let releaseNotes = diff --git a/lib/workers/repository/onboarding/pr/config-description.js b/lib/workers/repository/onboarding/pr/config-description.js index 6941f1b139..dec94f9926 100644 --- a/lib/workers/repository/onboarding/pr/config-description.js +++ b/lib/workers/repository/onboarding/pr/config-description.js @@ -52,7 +52,7 @@ function getConfigDesc(config, packageFiles) { desc += ` - ${d}\n`; }); desc += '\n'; - desc += `š” Would you like to change the way ${appName} is upgrading your dependencies?`; + desc += `:abcd: Would you like to change the way ${appName} is upgrading your dependencies?`; desc += ` Simply edit the \`${defaultConfigFile}\` in this branch with your custom config and the list of Pull Requests in the "What to Expect" section below will be updated the next time ${appName} runs.`; desc += '\n\n---\n'; return desc; diff --git a/lib/workers/repository/onboarding/pr/errors-warnings.js b/lib/workers/repository/onboarding/pr/errors-warnings.js index 8c1e899d20..b1a783fb5c 100644 --- a/lib/workers/repository/onboarding/pr/errors-warnings.js +++ b/lib/workers/repository/onboarding/pr/errors-warnings.js @@ -55,7 +55,7 @@ function getDepWarnings(packageFiles) { { warnings, warningFiles }, 'Found package lookup warnings in onboarding' ); - warningText = `\n---\n\n### ā ļø Dependency Lookup Warnings ā ļø\n\n`; + warningText = `\n---\n\n### :warning: Dependency Lookup Warnings :warning:\n\n`; warningText += `Please correct - or verify that you can safely ignore - these lookup failures before you merge this PR.\n\n`; warnings.forEach(w => { warningText += `- \`${w}\`\n`; diff --git a/lib/workers/repository/onboarding/pr/index.js b/lib/workers/repository/onboarding/pr/index.js index 112c22a74c..d3f26dd8e1 100644 --- a/lib/workers/repository/onboarding/pr/index.js +++ b/lib/workers/repository/onboarding/pr/index.js @@ -20,8 +20,8 @@ async function ensureOnboardingPr(config, packageFiles, branches) { logger.debug('Filling in onboarding PR template'); let prTemplate = `Welcome to [${appName}](${urls.homepage})! This is an onboarding PR to help you understand and configure settings before regular Pull Requests begin.\n\n`; prTemplate += config.requireConfig - ? `š¦ To activate ${appName}, merge this Pull Request. To disable ${appName}, simply close this Pull Request unmerged.\n\n` - : `š¦ ${appName} will begin keeping your dependencies up-to-date only once you merge or close this Pull Request.\n\n`; + ? `:vertical_traffic_light: To activate ${appName}, merge this Pull Request. To disable ${appName}, simply close this Pull Request unmerged.\n\n` + : `:vertical_traffic_light: ${appName} will begin keeping your dependencies up-to-date only once you merge or close this Pull Request.\n\n`; prTemplate += ` --- @@ -34,7 +34,7 @@ async function ensureOnboardingPr(config, packageFiles, branches) { --- -ā Got questions? Check out ${appName}'s [Docs](${urls.documentation}), particularly the Getting Started section. +:question: Got questions? Check out ${appName}'s [Docs](${urls.documentation}), particularly the Getting Started section. If you need any further assistance then you can also [request help here](${urls.help}). `; let prBody = prTemplate; @@ -57,9 +57,9 @@ If you need any further assistance then you can also [request help here](${urls. if (!existingPr || existingPr.canRebase) { configDesc = getConfigDesc(config, packageFiles); } else { - configDesc = `### Configuration\n\nš” ${appName} has detected a custom config for this PR. Feel free to ask for [help](${urls.help}) if you have any doubts and would like it reviewed.\n\n`; + configDesc = `### Configuration\n\n:abcd: ${appName} has detected a custom config for this PR. Feel free to ask for [help](${urls.help}) if you have any doubts and would like it reviewed.\n\n`; if (existingPr.isConflicted) { - configDesc += `ā ļø This PR has a merge conflict, however ${appName} is unable to automatically fix that due to edits in this branch. Please resolve the merge conflict manually.\n\n`; + configDesc += `:warning: This PR has a merge conflict, however ${appName} is unable to automatically fix that due to edits in this branch. Please resolve the merge conflict manually.\n\n`; } else { configDesc += `Important: Now that this branch is edited, ${appName} can't rebase it from the base branch any more. If you make changes to the base branch that could impact this onboarding PR, please merge them manually.\n\n`; } diff --git a/lib/workers/repository/onboarding/pr/pr-list.js b/lib/workers/repository/onboarding/pr/pr-list.js index 6f4ca388c4..08d503e8f3 100644 --- a/lib/workers/repository/onboarding/pr/pr-list.js +++ b/lib/workers/repository/onboarding/pr/pr-list.js @@ -57,7 +57,7 @@ function getPrList(config, branches) { config.prHourlyLimit < 5 && config.prHourlyLimit < branches.length ) { - prDesc += `<br />\n\nšø Branch creation will be limited to maximum ${config.prHourlyLimit} per hour, so it doesn't swamp any CI resources or spam the project. See docs for \`prhourlylimit\` for details.\n\n`; + prDesc += `<br />\n\n:children_crossing: Branch creation will be limited to maximum ${config.prHourlyLimit} per hour, so it doesn't swamp any CI resources or spam the project. See docs for \`prhourlylimit\` for details.\n\n`; } return prDesc; } diff --git a/test/workers/pr/__snapshots__/index.spec.js.snap b/test/workers/pr/__snapshots__/index.spec.js.snap index 0d6792eaf3..8885b22f7b 100644 --- a/test/workers/pr/__snapshots__/index.spec.js.snap +++ b/test/workers/pr/__snapshots__/index.spec.js.snap @@ -34,7 +34,7 @@ Array [ |---|---|---|---| | [dummy](https://dummy.com) ([source](https://github.com/renovateapp/dummy), [changelog](https://github.com/renovateapp/dummy/changelog.md)) | devDependencies | pin | \`1.0.0\` -> \`1.1.0\` | -š **Important**: Renovate will wait until you have merged this Pin PR before creating any *upgrade* PRs for the affected packages. Add the preset \`:preserveSemverRanges\` your config if you instead don't wish to pin dependencies. +:pushpin: **Important**: Renovate will wait until you have merged this Pin PR before creating any *upgrade* PRs for the affected packages. Add the preset \`:preserveSemverRanges\` your config if you instead don't wish to pin dependencies. --- @@ -53,13 +53,13 @@ Array [ ### Renovate configuration -š **Schedule**: \\"before 5am\\" in timezone some timezone. +:date: **Schedule**: \\"before 5am\\" in timezone some timezone. -š¦ **Automerge**: Disabled by config. Please merge this manually once you are satisfied. +:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. -ā»ļø **Rebasing**: Whenever PR is stale, or if you modify the PR title to begin with \\"\`rebase!\`\\". +:recycle: **Rebasing**: Whenever PR is stale, or if you modify the PR title to begin with \\"\`rebase!\`\\". -š **Ignore**: Close this PR and you won't be reminded about this update again. +:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- @@ -100,13 +100,13 @@ Array [ ### Renovate configuration -š **Schedule**: \\"before 5am\\" (UTC). +:date: **Schedule**: \\"before 5am\\" (UTC). -š¦ **Automerge**: Enabled. +:vertical_traffic_light: **Automerge**: Enabled. -ā»ļø **Rebasing**: Whenever PR becomes conflicted, or if you modify the PR title to begin with \\"\`rebase!\`\\". +:recycle: **Rebasing**: Whenever PR becomes conflicted, or if you modify the PR title to begin with \\"\`rebase!\`\\". -š **Ignore**: Close this PR and you won't be reminded about this update again. +:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- @@ -138,9 +138,9 @@ note 1 note 2 -š” If you wish to disable git hash updates, add \`\\":disableDigestUpdates\\"\` to the extends array in your config. +:abcd: If you wish to disable git hash updates, add \`\\":disableDigestUpdates\\"\` to the extends array in your config. -š§ This Pull Request updates lock files to use the latest dependency versions. +:wrench: This Pull Request updates lock files to use the latest dependency versions. --- @@ -164,13 +164,13 @@ note 2 ### Renovate configuration -š **Schedule**: At any time (no schedule defined). +:date: **Schedule**: At any time (no schedule defined). -š¦ **Automerge**: Disabled by config. Please merge this manually once you are satisfied. +:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. -ā»ļø **Rebasing**: Whenever PR becomes conflicted, or if you modify the PR title to begin with \\"\`rebase!\`\\". +:recycle: **Rebasing**: Whenever PR becomes conflicted, or if you modify the PR title to begin with \\"\`rebase!\`\\". -š» **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://github.com/renovatebot/config-help/issues) if that's undesired. +:ghost: **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://github.com/renovatebot/config-help/issues) if that's undesired. --- @@ -211,13 +211,13 @@ Array [ ### Renovate configuration -š **Schedule**: At any time (no schedule defined). +:date: **Schedule**: At any time (no schedule defined). -š¦ **Automerge**: Disabled by config. Please merge this manually once you are satisfied. +:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. -ā»ļø **Rebasing**: Whenever PR becomes conflicted, or if you modify the PR title to begin with \\"\`rebase!\`\\". +:recycle: **Rebasing**: Whenever PR becomes conflicted, or if you modify the PR title to begin with \\"\`rebase!\`\\". -š **Ignore**: Close this PR and you won't be reminded about this update again. +:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- @@ -256,13 +256,13 @@ Object { ### Renovate configuration -š **Schedule**: \\"before 5am\\" (UTC). +:date: **Schedule**: \\"before 5am\\" (UTC). -š¦ **Automerge**: Enabled. +:vertical_traffic_light: **Automerge**: Enabled. -ā»ļø **Rebasing**: Whenever PR becomes conflicted, or if you modify the PR title to begin with \\"\`rebase!\`\\". +:recycle: **Rebasing**: Whenever PR becomes conflicted, or if you modify the PR title to begin with \\"\`rebase!\`\\". -š **Ignore**: Close this PR and you won't be reminded about this update again. +:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- @@ -298,13 +298,13 @@ Object { ### Renovate configuration -š **Schedule**: \\"before 5am\\" (UTC). +:date: **Schedule**: \\"before 5am\\" (UTC). -š¦ **Automerge**: Enabled. +:vertical_traffic_light: **Automerge**: Enabled. -ā»ļø **Rebasing**: Whenever PR becomes conflicted, or if you modify the PR title to begin with \\"\`rebase!\`\\". +:recycle: **Rebasing**: Whenever PR becomes conflicted, or if you modify the PR title to begin with \\"\`rebase!\`\\". -š **Ignore**: Close this PR and you won't be reminded about this update again. +:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- diff --git a/test/workers/repository/onboarding/pr/__snapshots__/config-description.spec.js.snap b/test/workers/repository/onboarding/pr/__snapshots__/config-description.spec.js.snap index 6ebf8cda03..c36da47699 100644 --- a/test/workers/repository/onboarding/pr/__snapshots__/config-description.spec.js.snap +++ b/test/workers/repository/onboarding/pr/__snapshots__/config-description.spec.js.snap @@ -9,7 +9,7 @@ Based on the default config's presets, Renovate will: - Start dependency updates only once this Configure Renovate PR is merged - Run Renovate on following schedule: before 5am -š” Would you like to change the way Renovate is upgrading your dependencies? Simply edit the \`renovate.json\` in this branch with your custom config and the list of Pull Requests in the \\"What to Expect\\" section below will be updated the next time Renovate runs. +:abcd: Would you like to change the way Renovate is upgrading your dependencies? Simply edit the \`renovate.json\` in this branch with your custom config and the list of Pull Requests in the \\"What to Expect\\" section below will be updated the next time Renovate runs. --- " @@ -26,7 +26,7 @@ Based on the default config's presets, Renovate will: - description two - something else -š” Would you like to change the way Renovate is upgrading your dependencies? Simply edit the \`renovate.json\` in this branch with your custom config and the list of Pull Requests in the \\"What to Expect\\" section below will be updated the next time Renovate runs. +:abcd: Would you like to change the way Renovate is upgrading your dependencies? Simply edit the \`renovate.json\` in this branch with your custom config and the list of Pull Requests in the \\"What to Expect\\" section below will be updated the next time Renovate runs. --- " @@ -44,7 +44,7 @@ Based on the default config's presets, Renovate will: - something else - this is Docker-only -š” Would you like to change the way Renovate is upgrading your dependencies? Simply edit the \`renovate.json\` in this branch with your custom config and the list of Pull Requests in the \\"What to Expect\\" section below will be updated the next time Renovate runs. +:abcd: Would you like to change the way Renovate is upgrading your dependencies? Simply edit the \`renovate.json\` in this branch with your custom config and the list of Pull Requests in the \\"What to Expect\\" section below will be updated the next time Renovate runs. --- " diff --git a/test/workers/repository/onboarding/pr/__snapshots__/errors-warnings.spec.js.snap b/test/workers/repository/onboarding/pr/__snapshots__/errors-warnings.spec.js.snap index ba787dda8c..7ad90ac61b 100644 --- a/test/workers/repository/onboarding/pr/__snapshots__/errors-warnings.spec.js.snap +++ b/test/workers/repository/onboarding/pr/__snapshots__/errors-warnings.spec.js.snap @@ -4,7 +4,7 @@ exports[`workers/repository/onboarding/pr/errors-warnings getDepWarnings() retur " --- -### ā ļø Dependency Lookup Warnings ā ļø +### :warning: Dependency Lookup Warnings :warning: Please correct - or verify that you can safely ignore - these lookup failures before you merge this PR. diff --git a/test/workers/repository/onboarding/pr/__snapshots__/pr-list.spec.js.snap b/test/workers/repository/onboarding/pr/__snapshots__/pr-list.spec.js.snap index e03ee9b100..9b558af3c2 100644 --- a/test/workers/repository/onboarding/pr/__snapshots__/pr-list.spec.js.snap +++ b/test/workers/repository/onboarding/pr/__snapshots__/pr-list.spec.js.snap @@ -36,7 +36,7 @@ With your current configuration, Renovate will create 2 Pull Requests: <br /> -šø Branch creation will be limited to maximum 1 per hour, so it doesn't swamp any CI resources or spam the project. See docs for \`prhourlylimit\` for details. +:children_crossing: Branch creation will be limited to maximum 1 per hour, so it doesn't swamp any CI resources or spam the project. See docs for \`prhourlylimit\` for details. " `; -- GitLab