Merge remote-tracking branch 'origin/master' into dev

This commit is contained in:
Koen Kanters 2020-11-26 16:35:57 +01:00
commit 749e6789b8
5 changed files with 14 additions and 5 deletions

View File

@ -76,4 +76,13 @@ jobs:
--header "Content-Type: application/json" \ --header "Content-Type: application/json" \
--data '{"definition": {"id": 1}}' \ --data '{"definition": {"id": 1}}' \
-u ${{ secrets.HASSIO_TRIGGER_SECRET }} \ -u ${{ secrets.HASSIO_TRIGGER_SECRET }} \
"https://dev.azure.com/danielwelch2101/hassio-zigbee2mqtt/_apis/build/builds?api-version=5.1" "https://dev.azure.com/danielwelch2101/hassio-zigbee2mqtt/_apis/build/builds?api-version=5.1"
- name: Trigger zigbee2mqtt/hassio-zigbee2mqtt build
if: github.ref == 'refs/heads/dev' && github.event_name == 'push'
run: |
curl -s \
--request POST \
--header "Content-Type: application/json" \
--data '{"definition": {"id": 9}}' \
-u ${{ secrets.HASSIO_TRIGGER_SECRET }} \
"https://dev.azure.com/zigbee2mqtt/Zigbee2mqtt%20Add-on/_apis/build/builds?api-version=5.1"

View File

@ -18,7 +18,7 @@ jobs:
- run: npm install - run: npm install
- run: npm ls --depth 0 --prod --parseable | tail -n +2 | grep -v "zigbee" | xargs -I '{}' basename "{}" | xargs -I '{}' npm install '{}'@latest - run: npm ls --depth 0 --prod --parseable | tail -n +2 | grep -v "zigbee" | xargs -I '{}' basename "{}" | xargs -I '{}' npm install '{}'@latest
- run: rm -rf node_modules npm-shrinkwrap.json && npm install && npm shrinkwrap --dev - run: rm -rf node_modules npm-shrinkwrap.json && npm install && npm shrinkwrap --dev
- uses: peter-evans/create-pull-request@v2 - uses: peter-evans/create-pull-request@v3
with: with:
commit-message: Update dependencies commit-message: Update dependencies
branch: "update_deps" branch: "update_deps"

View File

@ -15,7 +15,7 @@ jobs:
with: with:
node-version: 12 node-version: 12
- run: npm install zigbee2mqtt-frontend@${{ github.event.client_payload.version }} --save-exact - run: npm install zigbee2mqtt-frontend@${{ github.event.client_payload.version }} --save-exact
- uses: peter-evans/create-pull-request@v2 - uses: peter-evans/create-pull-request@v3
with: with:
commit-message: Update zigbee2mqtt-frontend to ${{ github.event.client_payload.version }} commit-message: Update zigbee2mqtt-frontend to ${{ github.event.client_payload.version }}
branch: "update_frontend" branch: "update_frontend"

View File

@ -15,7 +15,7 @@ jobs:
with: with:
node-version: 12 node-version: 12
- run: npm install zigbee-herdsman@${{ github.event.client_payload.version }} --save-exact - run: npm install zigbee-herdsman@${{ github.event.client_payload.version }} --save-exact
- uses: peter-evans/create-pull-request@v2 - uses: peter-evans/create-pull-request@v3
with: with:
commit-message: Update zigbee-herdsman to ${{ github.event.client_payload.version }} commit-message: Update zigbee-herdsman to ${{ github.event.client_payload.version }}
branch: "update_zh" branch: "update_zh"

View File

@ -15,7 +15,7 @@ jobs:
with: with:
node-version: 12 node-version: 12
- run: npm install zigbee-herdsman-converters@${{ github.event.client_payload.version }} --save-exact - run: npm install zigbee-herdsman-converters@${{ github.event.client_payload.version }} --save-exact
- uses: peter-evans/create-pull-request@v2 - uses: peter-evans/create-pull-request@v3
with: with:
commit-message: Update zigbee-herdsman-converters to ${{ github.event.client_payload.version }} commit-message: Update zigbee-herdsman-converters to ${{ github.event.client_payload.version }}
branch: "update_zhc" branch: "update_zhc"