From eb261980898a260905e5ee1d75de1c1b3d78cbd8 Mon Sep 17 00:00:00 2001 From: Camila Belo Date: Wed, 10 Jan 2024 09:51:43 +0100 Subject: [PATCH 1/2] docs(release): adding throubleshooting section Signed-off-by: Camila Belo --- docs/publishing.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/publishing.md b/docs/publishing.md index f8964278b5..adf75b4b32 100644 --- a/docs/publishing.md +++ b/docs/publishing.md @@ -134,3 +134,10 @@ process is used to release an emergency fix as version `6.5.1` in the patch rele - [ ] The fix, which you can likely cherry-pick from your patch branch: `git cherry-pick origin/patch/v1.18.0^` - [ ] An updated `CHANGELOG.md` of all patched packages from the tip of the patch branch, `git checkout origin/patch/v1.18.0 -- {packages,plugins}/*/CHANGELOG.md`. Note that if the patch happens after any next-line releases you'll need to restore those entries in the changelog, placing the patch release entry beneath any next-line release entries. - [ ] A changeset with the message "Applied the fix from version `6.5.1` of this package, which is part of the `v1.18.1` release of Backstage." + +## Throubleshooting + +### When the release workflow is not triggered for some reason, such as a GitHub incident + +Ask one of the maintainers to force push master back to a previous commit and then push the release merge commit again. This can break open pull requests and if that happens, we will have to go through each open pull request and rebase them with the new master base commit. + From c9f6399d020fe6c9bceb5b888c34c461b8df4786 Mon Sep 17 00:00:00 2001 From: Camila Belo Date: Wed, 10 Jan 2024 10:07:00 +0100 Subject: [PATCH 2/2] docs(publishing): apply suggestions on throubleshooting Co-authored-by: Patrik Oldsberg Signed-off-by: Camila Belo --- docs/publishing.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/publishing.md b/docs/publishing.md index adf75b4b32..64c6584a3c 100644 --- a/docs/publishing.md +++ b/docs/publishing.md @@ -139,5 +139,5 @@ process is used to release an emergency fix as version `6.5.1` in the patch rele ### When the release workflow is not triggered for some reason, such as a GitHub incident -Ask one of the maintainers to force push master back to a previous commit and then push the release merge commit again. This can break open pull requests and if that happens, we will have to go through each open pull request and rebase them with the new master base commit. +Ask one of the maintainers to force push master back to a previous commit and then push the release merge commit again.