From 15ac34cfd921e0d52a7783e20e5bf3ee5df9e3c7 Mon Sep 17 00:00:00 2001 From: Gilver Date: Mon, 26 Jan 2026 01:52:53 -0600 Subject: [PATCH 1/2] feat: sync-next workflow --- .github/workflows/sync-next.yml | 35 +++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 .github/workflows/sync-next.yml diff --git a/.github/workflows/sync-next.yml b/.github/workflows/sync-next.yml new file mode 100644 index 00000000..64ca1378 --- /dev/null +++ b/.github/workflows/sync-next.yml @@ -0,0 +1,35 @@ +name: Sync next with main +permissions: + contents: write + +on: + push: + branches: + - main + workflow_dispatch: + +jobs: + merge: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v6 + with: + ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }} + ref: next + + - name: Set up Git config + run: | + git config user.name "Raboneko" + git config user.email "raboneko@fyralabs.com" + git config gpg.format "ssh" + git config user.signingkey "${{ secrets.SSH_SIGNING_KEY }}" + git config --global merge.ours.driver true + git config --global commit.gpgsign true + + - name: Merge main into next + env: + GITHUB_TOKEN: ${{ secrets.MERGE_TOKEN }} + run: | + git fetch origin main + git merge --no-edit origin/main + git push origin next From 5410c76191e02f1add8bf634e76276ae841a32e0 Mon Sep 17 00:00:00 2001 From: Gilver Date: Thu, 29 Jan 2026 20:03:48 -0600 Subject: [PATCH 2/2] chore: Use Rabo's key for the whole section --- .github/workflows/sync-next.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/sync-next.yml b/.github/workflows/sync-next.yml index 64ca1378..fb9deb23 100644 --- a/.github/workflows/sync-next.yml +++ b/.github/workflows/sync-next.yml @@ -27,8 +27,6 @@ jobs: git config --global commit.gpgsign true - name: Merge main into next - env: - GITHUB_TOKEN: ${{ secrets.MERGE_TOKEN }} run: | git fetch origin main git merge --no-edit origin/main