Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix description + exclude changelog from rollbacks #161

Merged
merged 1 commit into from
Oct 30, 2021
Merged

Fix description + exclude changelog from rollbacks #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/rollback.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
9 changes: 4 additions & 5 deletions lib/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, '')
})
Expand Down