Update upmerge workflow to ignore config and body-end changes (#1267)

* update upmerge Signed-off-by: sk593 <[email protected]> * readd signoff Signed-off-by: sk593 <[email protected]> --------- Signed-off-by: sk593 <[email protected]>
radius-project · Nov 7, 2024 · d425e1d · d425e1d
1 parent e4d1c80
commit d425e1d
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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