From 7934ac3d2e7e489326c1bbb31bb243bfd9ed65f2 Mon Sep 17 00:00:00 2001 From: Angel-Padilla Date: Mon, 13 Oct 2025 18:22:52 -0600 Subject: [PATCH] feat: add sync-fork action This will help keep the fork up to date with new releases in the master branch --- .github/workflows/sync-fork.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/sync-fork.yml b/.github/workflows/sync-fork.yml index ea09d6d1c4f..9066b6ad97e 100644 --- a/.github/workflows/sync-fork.yml +++ b/.github/workflows/sync-fork.yml @@ -2,8 +2,8 @@ name: Sync Fork on: schedule: - - cron: '0 0 16 * *' # Runs daily at midnight UTC - workflow_dispatch: # Allows manual triggering + - cron: '0 0 16 * *' # every 16th of each month + workflow_dispatch: jobs: sync: @@ -15,11 +15,15 @@ jobs: - name: Checkout your forked repository uses: actions/checkout@v4 - - name: Add upstream remote - run: git remote add upstream https://github.com//.git # Replace with original details + - name: Set up Git + run: | + git config user.name "github-actions" + git config user.email "github-actions@github.com" - - name: Fetch upstream changes - run: git fetch upstream + - name: fetch upstream changes remote + run: | + git remote add upstream https://github.com/getsentry/self-hosted.git + git fetch upstream - name: Merge upstream into your branch run: | @@ -27,4 +31,4 @@ jobs: git rebase upstream/master - name: Push updates to your GitHub fork - run: git push origin master # Or your desired branch + run: git push origin master