diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md index c2b781776..0a46d908d 100644 --- a/.github/copilot-instructions.md +++ b/.github/copilot-instructions.md @@ -66,6 +66,9 @@ branches. PR's `changelogs/unreleased/-` file. The workflow automatically renames it to `-` on the backport branch so `hack/changelog-check.sh` passes and release notes cite the correct PR. +- **Changelog-not-required:** if the source PR is labeled + `kind/changelog-not-required`, that label is copied to the backport PR so + it isn't flagged as missing a changelog. - Only repository **owners, members, and collaborators** may trigger these commands. ## General coding guidelines diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 6bf64c853..83fac8cd8 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -27,6 +27,10 @@ name: Backport merged pull request # file is automatically renamed to - so that # hack/changelog-check.sh passes and release notes cite the correct PR. # +# If the source PR is labeled `kind/changelog-not-required` (i.e. it has no +# changelog file), that label is copied to the backport PR so it isn't +# flagged as missing a changelog either. +# # See: https://github.com/velero-io/velero/issues/9603 on: @@ -178,6 +182,9 @@ jobs: with: # Labels like `backport release-1.17` select the target branch. label_pattern: '^backport ([^ ]+)$' + # Carry over `kind/changelog-not-required` from the source PR so + # backport PRs of changelog-exempt changes aren't flagged as missing one. + copy_labels_pattern: '^kind/changelog-not-required$' # Prefer draft PRs with conflict markers over failing the job silently. experimental: | {