From 6dbd142c3abf4e7d17b28aefbf59b4e6787ac5c6 Mon Sep 17 00:00:00 2001 From: Jake Soenneker Date: Tue, 9 Jul 2024 21:54:29 +0000 Subject: [PATCH] automerge work --- .github/workflows/automerge.yml | 24 ------------------------ Soenneker.Redis.Lock.sln | 2 +- 2 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 .github/workflows/automerge.yml diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml deleted file mode 100644 index 89c873a4..00000000 --- a/.github/workflows/automerge.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: automerge -on: pull_request - -permissions: - contents: write - pull-requests: write - -env: - GH_TOKEN: ${{ secrets.RENOVATEBOT }} - -jobs: - automerge: - runs-on: ubuntu-latest - if: ${{ github.actor == 'renovate[bot]' }} - steps: - - name: Enable auto-merge for Renovate PRs - run: gh pr merge --auto --merge "$PR_URL" - env: - PR_URL: ${{github.event.pull_request.html_url}} - - - name: Approve patch and minor updates - run: gh pr review $PR_URL --approve - env: - PR_URL: ${{github.event.pull_request.html_url}} diff --git a/Soenneker.Redis.Lock.sln b/Soenneker.Redis.Lock.sln index a1d6e989..51055fa4 100644 --- a/Soenneker.Redis.Lock.sln +++ b/Soenneker.Redis.Lock.sln @@ -11,7 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{4E42 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{D786EC1A-4F59-412F-8624-83E6E3525B0C}" ProjectSection(SolutionItems) = preProject - .github\workflows\automerge.yml = .github\workflows\automerge.yml + .github\workflows\build-and-test.yml = .github\workflows\build-and-test.yml .github\workflows\publish-package.yml = .github\workflows\publish-package.yml