diff --git a/.gitea/workflows/sync-upstream.yaml b/.gitea/workflows/sync-upstream.yaml index df8f915cd7..0ccd0259c8 100644 --- a/.gitea/workflows/sync-upstream.yaml +++ b/.gitea/workflows/sync-upstream.yaml @@ -1,4 +1,5 @@ name: Sync Upstream Bluesky + on: schedule: - cron: '0 */8 * * *' @@ -14,17 +15,18 @@ jobs: ref: main fetch-depth: 0 - - name: Add upstream remote - run: git remote add upstream https://github.com/bluesky-social/social-app.git - - - name: Fetch upstream - run: git fetch upstream - - - name: Merge upstream changes + - name: Configure Git Identity run: | git config user.name "gitea-actions-bot" git config user.email "toaster+git@proot.uk" - git merge upstream/main --no-edit - - name: Push to origin - run: git push origin main \ No newline at end of file + - name: Add Upstream Remote + run: git remote add upstream https://github.com/bluesky-social/social-app.git + + - name: Fetch Upstream + run: git fetch upstream + + - name: Merge and Push + run: | + git merge upstream/main --no-edit + git push origin main \ No newline at end of file