From 0e248d5691052073cbf8a272d6d97c2f9cd662bb Mon Sep 17 00:00:00 2001 From: "opensearch-trigger-bot[bot]" <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Date: Tue, 29 Nov 2022 18:33:35 -0800 Subject: [PATCH] Update backport workflow to ignore changelog conflicts (#2729) (#2939) (#2948) Signed-off-by: Miki Signed-off-by: Miki (cherry picked from commit 8b303469e50db8515fd2b9f9aabad006cc0175fc) Signed-off-by: github-actions[bot] Signed-off-by: Miki Signed-off-by: github-actions[bot] Co-authored-by: github-actions[bot] (cherry picked from commit d58ce7bf188809fb4b0eb3b385cdac33cbf78604) Signed-off-by: github-actions[bot] Signed-off-by: Miki Signed-off-by: github-actions[bot] Co-authored-by: github-actions[bot] --- .github/workflows/backport.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index f515b254b868..1d05b4169306 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -22,10 +22,9 @@ jobs: # opensearch-trigger-bot installation ID installation_id: 22958780 - # Using fork of https://github.com/tibdex/backport - # https://github.com/tibdex/backport/pull/81 - name: Backport - uses: VachaShah/backport@v1.1.4 + uses: VachaShah/backport@v2.1.0 with: github_token: ${{ steps.github_app_token.outputs.token }} branch_name: backport/backport-${{ github.event.number }} + files_to_skip: "CHANGELOG.md"