From 7597406b93c6bc443eb9fafdbcb133a8c999eeea Mon Sep 17 00:00:00 2001 From: James Forbes Date: Sat, 30 Oct 2021 11:05:00 +1100 Subject: [PATCH] Fix description + exclude changelog from rollbacks --- .github/workflows/rollback.yml | 2 +- lib/index.js | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/rollback.yml b/.github/workflows/rollback.yml index 97063e5..66d2526 100644 --- a/.github/workflows/rollback.yml +++ b/.github/workflows/rollback.yml @@ -25,6 +25,6 @@ jobs: - run: npm ci - run: npm run build --if-present # todo-james replace with npx pr-release rollback - - run: node bin.js rollback --verbose --target main --source next --verbose --ignore 'package*' + - run: node bin.js rollback --verbose --target main --source next --verbose --ignore 'package*' --ignore changelog.md env: GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} \ No newline at end of file diff --git a/lib/index.js b/lib/index.js index c5caee6..dd58902 100644 --- a/lib/index.js +++ b/lib/index.js @@ -1277,13 +1277,12 @@ async function rollback({ version, ignore=null }){ , title: `Reinstate rolled back changes from ${currentReleaseTag}` , body: ` This PR contains all changes after ${version} through to the latest release ${currentReleaseTag}. - + These changes were previously removed from ${source} and ${target}. You can re-instate them by merging this PR. - + However, this branch was likely rolled back for a reason. You can use this branch to explore any reported bugs and fix them before re-instating these changes. - - Because your ${source} and ${target} branches have been scrubbed clean of these changes you can continue to work on other unrelated changes and release them - while errors in this changeset are investigated. + + Because your ${source} and ${target} branches have been scrubbed clean of these changes you can continue to work on other unrelated changes and release them while errors in this changeset are investigated. ` .replace(/^ /gm, '') })