Fix issue with pathspec 'master'

2025-11-11 15:01:15 +01:00
parent 3f21829810
commit 1d1cbc83f5
1 changed files with 4 additions and 3 deletions
@@ -13,6 +13,7 @@ jobs:
        uses: actions/checkout@v3
        with:
          fetch-depth: 0
+          ref: surf-webkit2

      - name: Add upstream remote
        run: |
@@ -21,10 +22,10 @@ jobs:

      - name: Merge upstream into surf-webkit2
        run: |
-          git checkout surf-webkit2
+          git config user.name "gitea-runner[bot]"
+          git config user.email "gitea-runner[bot]@noreply.erickahmed.com"
          git merge upstream/surf-webkit2 --strategy-option ours --no-edit || true

      - name: Push merged branch
        run: |
-          git push origin surf-webkit2
-
+          git push origin surf-webkit2