From 14aec8abe7e7533013b829a3a29b183c5e66d5e9 Mon Sep 17 00:00:00 2001 From: evgenrudenko22 <125033944+evgenrudenko22@users.noreply.github.com> Date: Sat, 7 Sep 2024 20:43:34 +0300 Subject: [PATCH] Delete Auto-Merge workflow --- .github/workflows/merge.yml | 35 ----------------------------------- 1 file changed, 35 deletions(-) delete mode 100644 .github/workflows/merge.yml diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml deleted file mode 100644 index 81a2a95..0000000 --- a/.github/workflows/merge.yml +++ /dev/null @@ -1,35 +0,0 @@ -name: Auto-Merge - -on: - push: - branches: - - build - - about - workflow_dispatch: - -jobs: - merge: - runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@v2 - - - name: Set up Git user - run: | - git config --global user.name 'github-actions' - git config --global user.email 'github-actions@github.com' - - - name: Fetch all branches - run: git fetch --all - - - name: Merge branch into main - run: | - git checkout main - git merge ${{ github.ref }} --no-ff --allow-unrelated-histories --strategy-option theirs - - - name: Push changes to main - run: | - git remote set-url origin https://${{ secrets.GITHUB_TOKEN }}@github.com/${{ git.repository }} - git push origin main - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}