Merge branch 'master' into dev

This commit is contained in:
Koen Kanters committed 2021-11-18 20:59:53 +01:00
commit 825c7465ae
2 files changed
+4

No files matched your search

+2
View File
@@ -16,6 +16,7 @@ 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"
@@ -23,5 +24,6 @@ jobs:
- 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
+2
View File
@@ -16,6 +16,7 @@ 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"
@@ -23,5 +24,6 @@ jobs:
- 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