diff --git a/.gitea/workflows/sync-upstream.yml b/.gitea/workflows/sync-upstream.yml index cfdc36f..245d67e 100644 --- a/.gitea/workflows/sync-upstream.yml +++ b/.gitea/workflows/sync-upstream.yml @@ -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 \ No newline at end of file