From d425e1d78551bcfecb6c50583c2e8849e311918f Mon Sep 17 00:00:00 2001 From: Shruthi Kumar Date: Thu, 7 Nov 2024 13:23:39 -0800 Subject: [PATCH] Update upmerge workflow to ignore config and body-end changes (#1267) * update upmerge Signed-off-by: sk593 * readd signoff Signed-off-by: sk593 --------- Signed-off-by: sk593 --- .github/workflows/upmerge.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/upmerge.yaml b/.github/workflows/upmerge.yaml index 63d422bde..5c782037d 100644 --- a/.github/workflows/upmerge.yaml +++ b/.github/workflows/upmerge.yaml @@ -62,15 +62,15 @@ jobs: export SOURCE_BRANCH=$(basename ${{ github.ref }}) echo "Upmerging docs from $SOURCE_BRANCH to edge" git fetch origin $SOURCE_BRANCH - - git merge -m "Upmerge to edge" origin/$SOURCE_BRANCH + git merge --no-commit origin/$SOURCE_BRANCH + git checkout edge -- docs/config.toml docs/layouts/partials/hooks/body-end.html + git commit -m "Upmerge to edge" if git diff --quiet edge; then echo "No changes to merge from $SOURCE_BRANCH to edge" echo "NO_CHANGES=true" >> $GITHUB_ENV else echo "Pushing $BRANCH_NAME for PR to edge" - git reset HEAD docs/config.toml docs/layouts/partials/hooks/body-end.html git push --set-upstream origin $BRANCH_NAME fi