diff --git a/.github/workflows/update_zh.yml b/.github/workflows/update_zh.yml index 299a7093a..b949586ad 100644 --- a/.github/workflows/update_zh.yml +++ b/.github/workflows/update_zh.yml @@ -20,3 +20,8 @@ jobs: 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: + 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..6e372041f 100644 --- a/.github/workflows/update_zhc.yml +++ b/.github/workflows/update_zhc.yml @@ -20,3 +20,8 @@ jobs: 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: + pull-request-number: ${{ steps.cpr.outputs.pull-request-number }} + merge-method: squash \ No newline at end of file diff --git a/README.md b/README.md index fb0414e1e..1dfb35bb7 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@

Zigbee2MQTT 🌉 🐝

- Allows you to use your Zigbee devices without the vendors bridge or gateway. + Allows you to use your Zigbee devices without the vendor's bridge or gateway.

It bridges events and allows you to control your Zigbee devices via MQTT. In this way you can integrate your Zigbee devices with whatever smart home infrastructure you are using. @@ -75,7 +75,7 @@ Zigbee2MQTT uses TypeScript (partially for now). Therefore after making changes ## Supported devices See [Supported devices](https://www.zigbee2mqtt.io/supported-devices) to check whether your device is supported. There is quite an extensive list, including devices from vendors like Xiaomi, Ikea, Philips, OSRAM and more. -If it's not listed in [Supported devices](https://www.zigbee2mqtt.io/supported-devices), support can be added (fairly) easy, see [How to support new devices](https://www.zigbee2mqtt.io/advanced/support-new-devices/01_support_new_devices.html). +If it's not listed in [Supported devices](https://www.zigbee2mqtt.io/supported-devices), support can be added (fairly) easily, see [How to support new devices](https://www.zigbee2mqtt.io/advanced/support-new-devices/01_support_new_devices.html). ## Support & help If you need assistance you can check [opened issues](https://github.com/Koenkk/zigbee2mqtt/issues). Feel free to help with Pull Requests when you were able to fix things or add new devices or just share the love on social media.