Skip to content

Try to address merge conflict when releasing #824

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ignatiusm wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Try to address merge conflict when releasing #824

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .github/workflows/promote-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading