From ed1a618f6d9bb037559e1f3b49fe1e34b8ed9517 Mon Sep 17 00:00:00 2001 From: CanbiZ <47820557+MickLesk@users.noreply.github.com> Date: Tue, 14 Jan 2025 14:40:41 +0100 Subject: [PATCH] Delete .github/workflows/merge-main.yml --- .github/workflows/merge-main.yml | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 .github/workflows/merge-main.yml diff --git a/.github/workflows/merge-main.yml b/.github/workflows/merge-main.yml deleted file mode 100644 index fa8a984b..00000000 --- a/.github/workflows/merge-main.yml +++ /dev/null @@ -1,29 +0,0 @@ -name: Merge main into update-app-headers - -on: - push: - branches: - - main - paths: - - 'ct/**.sh' - -jobs: - merge-main: - runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@v2 - - - name: Set up Git - run: | - git config --global user.name "GitHub Actions" - git config --global user.email "actions@github.com" - - - name: Merge main into update-app-headers silently - run: | - git fetch origin - git checkout update-app-headers - git merge origin/main --allow-unrelated-histories --no-commit -m "Merge main into update-app-headers" - git push origin update-app-headers > /dev/null 2>&1 || true - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}