From 252db2b720c02ff45ae9d552dfcf6859aafaf503 Mon Sep 17 00:00:00 2001 From: rcourtman Date: Tue, 20 Jan 2026 20:07:51 +0000 Subject: [PATCH] ci: use git pull --rebase in helm-pages.yml to avoid push conflicts --- .github/workflows/helm-pages.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/helm-pages.yml b/.github/workflows/helm-pages.yml index b3f022d09..bfabd8049 100644 --- a/.github/workflows/helm-pages.yml +++ b/.github/workflows/helm-pages.yml @@ -56,7 +56,8 @@ jobs: git config user.email "$GITHUB_ACTOR@users.noreply.github.com" git add README.md git commit -m "Auto-update Helm chart documentation" - git push + git pull --rebase origin main + git push origin main fi cd ../../.. @@ -100,7 +101,8 @@ jobs: git config user.email "$GITHUB_ACTOR@users.noreply.github.com" git add deploy/helm/pulse/Chart.yaml git commit -m "Auto-update Helm chart version to $VERSION" - git push + git pull --rebase origin main + git push origin main fi - name: Validate Helm chart