From 06cc57e87dc7583759fd5463701e4b3c0ef45144 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 30 Nov 2022 02:52:54 +0000 Subject: [PATCH 1/2] [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] --- .github/workflows/backport.yml | 2 +- 1 file changed, 1 insertion(+), 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" From 0987c9be10d441897be397af154032f720210067 Mon Sep 17 00:00:00 2001 From: Josh Romero Date: Wed, 30 Nov 2022 18:55:50 +0000 Subject: [PATCH 2/2] [Chore] Update changelog Signed-off-by: Josh Romero --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 027f322e2880..4cbce3da5a41 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -54,6 +54,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