From 97521478c65ef110f5504f3c1387da4734ed3f03 Mon Sep 17 00:00:00 2001 From: Koen Kanters Date: Thu, 18 Nov 2021 20:14:26 +0100 Subject: [PATCH] Enable auto merge for update_zhc/zh --- .github/workflows/update_zh.yml | 7 +++++++ .github/workflows/update_zhc.yml | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/.github/workflows/update_zh.yml b/.github/workflows/update_zh.yml index 299a7093a..4223e9c9e 100644 --- a/.github/workflows/update_zh.yml +++ b/.github/workflows/update_zh.yml @@ -16,7 +16,14 @@ jobs: node-version: 14 - run: npm install zigbee-herdsman@${{ github.event.client_payload.version }} --save-exact - uses: peter-evans/create-pull-request@v3 + id: cpr with: commit-message: Update zigbee-herdsman to ${{ github.event.client_payload.version }} branch: "update_zh" title: Update zigbee-herdsman to ${{ github.event.client_payload.version }} + - uses: peter-evans/enable-pull-request-automerge@v1 + if: steps.cpr.outputs.pull-request-operation == 'created' + with: + token: ${{ secrets.CR_PAT }} + pull-request-number: ${{ steps.cpr.outputs.pull-request-number }} + merge-method: squash \ No newline at end of file diff --git a/.github/workflows/update_zhc.yml b/.github/workflows/update_zhc.yml index 2268831d4..02e0379cf 100644 --- a/.github/workflows/update_zhc.yml +++ b/.github/workflows/update_zhc.yml @@ -16,7 +16,14 @@ jobs: node-version: 14 - run: npm install zigbee-herdsman-converters@${{ github.event.client_payload.version }} --save-exact - uses: peter-evans/create-pull-request@v3 + id: cpr with: commit-message: Update zigbee-herdsman-converters to ${{ github.event.client_payload.version }} branch: "update_zhc" title: Update zigbee-herdsman-converters to ${{ github.event.client_payload.version }} + - uses: peter-evans/enable-pull-request-automerge@v1 + if: steps.cpr.outputs.pull-request-operation == 'created' + with: + token: ${{ secrets.CR_PAT }} + pull-request-number: ${{ steps.cpr.outputs.pull-request-number }} + merge-method: squash \ No newline at end of file