From 42104c942174bf591849ce4c45c448ee5f74afb6 Mon Sep 17 00:00:00 2001 From: ignatiusm Date: Fri, 10 Apr 2026 17:17:41 +1200 Subject: [PATCH] Try to address merge conflict when releasing --- .github/workflows/promote-release.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/promote-release.yml b/.github/workflows/promote-release.yml index ccfb1fd7f..89a13c3c6 100644 --- a/.github/workflows/promote-release.yml +++ b/.github/workflows/promote-release.yml @@ -51,7 +51,13 @@ jobs: git config --global user.email "github-actions[bot]@users.noreply.github.com" git config --global user.name "github-actions[bot]" git checkout main - git merge ${{ steps.get_commit.outputs.commit_sha }} + git merge ${{ steps.get_commit.outputs.commit_sha }} || { + echo "Merge conflict detected. Resolving Chart.yaml to release version." + git checkout ${{ steps.get_commit.outputs.commit_sha }} -- .helm/ctrl/Chart.yaml + git add .helm/ctrl/Chart.yaml + git commit -m "Auto-resolved Chart.yaml conflict during release promotion" + } + git push origin main - name: Create and push release tag