ci: fix? sync workflow

bates64 · Jun 5, 2024 · 0cec8ae · 0cec8ae
1 parent ea4a872
commit 0cec8ae
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -2,3 +2,8 @@
 
 # suppress asm/nonmatchings/ in GitHub diffs
 asm/nonmatchings/**/*.s linguist-generated
+
+*.c	diff=cpp
+*.h	diff=cpp
+
+src/world/dead/**/* merge=ours
diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml
@@ -38,10 +38,6 @@ jobs:
         run: |
           git checkout ${BASE_BRANCH}
           git merge --no-ff --log FETCH_HEAD -m "Merge upstream changes"
-      - name: Push changes
-        run: git push origin ${BASE_BRANCH}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Create Pull Request
         run: |
           gh pr create --title "Sync with $UPSTREAM" --body "Automated PR to keep this repository in sync with upstream. Beep boop." --base ${BASE_BRANCH}