From dfe8d34f6730590c13a7c2179a8d1dd3a9bd7fd8 Mon Sep 17 00:00:00 2001 From: "opensearch-trigger-bot[bot]" <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Date: Wed, 30 Nov 2022 16:08:19 -0800 Subject: [PATCH] [Backport 1.3] [CI] update backport custom branch name (#2766) (#2962) * [CI] update backport custom branch name (#2766) (#2954) GitHub action for backporting got updated to change custom branch to head template. This was causing issues in clean up and skipping steps. Issue: n/a Signed-off-by: Kawika Avilla (cherry picked from commit 4527f6e49781712cfd7349b2f0892538399a702d) Signed-off-by: github-actions[bot] * [Chore] Update changelog Signed-off-by: Josh Romero Signed-off-by: Kawika Avilla Signed-off-by: github-actions[bot] Signed-off-by: Josh Romero Co-authored-by: github-actions[bot] Co-authored-by: Josh Romero --- .github/workflows/backport.yml | 2 +- CHANGELOG.md | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index cb2e3c3049c6..0ba694cbf213 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -37,5 +37,5 @@ jobs: uses: VachaShah/backport@v2.1.0 with: github_token: ${{ steps.github_app_token.outputs.token }} - branch_name: backport/backport-${{ github.event.number }} + head_template: backport/backport-<%= number %>-to-<%= base %> files_to_skip: "CHANGELOG.md" diff --git a/CHANGELOG.md b/CHANGELOG.md index 134dceb51f11..49d530b0e865 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -56,6 +56,8 @@ Add the release runbook to RELEASING.md ([#2533](https://github.com/opensearch-p ### 🚞 Infrastructure +* Update backport custom branch name to utilize head template ([#2766](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2766)) + ### 📝 Documentation ### 🛠 Maintenance