From 833bb7c0ff7d2c154e886dc76b2545fd05ba5e9c Mon Sep 17 00:00:00 2001 From: Kawika Avilla Date: Thu, 3 Nov 2022 11:55:05 -0700 Subject: [PATCH] [CI] update backport custom branch name (#2766) 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 --- .github/workflows/backport.yml | 2 +- CHANGELOG.md | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) 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 185d61da7d28..14e8f3ef6210 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,7 +26,8 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) ### 🚞 Infrastructure -* Add CHANGELOG.md and related workflows ([#2414](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2414)) +- Add CHANGELOG.md and related workflows ([#2414](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2414)) +- Update backport custom branch name to utilize head template ([#2766](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2766)) ### 📝 Documentation