From b8052ef5ba5a6018b18cdf9bee3742f7aeef5e65 Mon Sep 17 00:00:00 2001 From: yusing Date: Wed, 19 Nov 2025 15:29:17 +0800 Subject: [PATCH] ci: Add workflow to automatically merge main into compat on tag push --- .github/workflows/merge-main-into-compat.yml | 28 ++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .github/workflows/merge-main-into-compat.yml diff --git a/.github/workflows/merge-main-into-compat.yml b/.github/workflows/merge-main-into-compat.yml new file mode 100644 index 00000000..28946612 --- /dev/null +++ b/.github/workflows/merge-main-into-compat.yml @@ -0,0 +1,28 @@ +name: Merge Main Into Compat + +on: + push: + tags: + - v* + +jobs: + merge: + runs-on: ubuntu-latest + permissions: + contents: write + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Configure git user + run: | + git config user.name "github-actions[bot]" + git config user.email "github-actions[bot]@users.noreply.github.com" + - name: Merge main into compat + run: | + git fetch origin compat + git checkout compat + git merge --no-edit origin/main + - name: Push compat + run: | + git push origin compat