From 7c08a8da2e4a7637d37ddb4fc4835faa604b1233 Mon Sep 17 00:00:00 2001 From: yusing Date: Fri, 5 Dec 2025 16:29:45 +0800 Subject: [PATCH] Revert "ci: Add workflow to automatically merge main into compat on tag push" This reverts commit 9930f3fa2ef69e1852b1c990aeae3e6f995e6731. --- .github/workflows/merge-main-into-compat.yml | 28 -------------------- 1 file changed, 28 deletions(-) delete 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 deleted file mode 100644 index 28946612..00000000 --- a/.github/workflows/merge-main-into-compat.yml +++ /dev/null @@ -1,28 +0,0 @@ -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