diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml deleted file mode 100644 index aa56eb9de..000000000 --- a/.github/workflows/merge.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: Merge - -on: - workflow_run: - workflows: ["Publish"] - types: [completed] - -jobs: - Merge: - runs-on: ubuntu-latest - if: ${{ github.event.workflow_run.conclusion == 'success' }} - steps: - - name: Checkout repositiory - uses: actions/checkout@v2 - with: - token: ${{ secrets.MACHINE_001 }} - fetch-depth: "0" - ref: "develop" - - - name: Set Github credentials - run: | - git config user.name searchspring-machine - git config user.email machine@searchspring.com - - - name: Merge main into develop branch - run: | - git merge -X theirs origin/main - git push