Skip to content

Commit

Permalink
Merge branch 'zwave-js-13' into associations-error
Browse files Browse the repository at this point in the history
  • Loading branch information
robertsLando authored Jul 17, 2024
2 parents 5d107f7 + 6cb0c89 commit b393799
Show file tree
Hide file tree
Showing 17 changed files with 127 additions and 109 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ jobs:

steps:
- name: Checkout Z-Wave JS UI
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3.4.1
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
language: ['javascript']
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/discord-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:

steps:
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v4

- uses: actions/github-script@v6
name: Post release notes to Discord
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker-release-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ jobs:
packages: write
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 0 # fetch everything
ref: ${{ github.event.inputs.branch }}

- uses: actions/setup-node@v3.6.0
- uses: actions/setup-node@v4
with:
node-version: 20
cache: 'npm'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
matrix:
platforms: [linux/amd64, linux/arm64, linux/arm/v7]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: docker/setup-buildx-action@v3
- uses: docker/setup-qemu-action@v3
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/package_arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
matrix:
node-version: [18.x]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: "npm"
Expand All @@ -36,7 +36,7 @@ jobs:
dockerRunArgs: |
--volume "${PWD}:/app"
base_image: arm64v8/node:18-bullseye
base_image: '--platform=linux/arm64 arm64v8/node:18-bullseye'

# Rebuild .node modules for am64
run: |
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/package_armv7.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [18.18.2] # NB: when pkg-fetch bumps binaries, this must be updated
node-version: [18.19.1] # NB: when pkg-fetch bumps binaries, this must be updated
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Use Node.js 18.18.2
uses: actions/setup-node@v3
- name: Use Node.js 18.19.1
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: "npm"
Expand All @@ -43,7 +43,7 @@ jobs:
dockerRunArgs: |
--volume "${PWD}:/app"
base_image: arm32v7/node:18-bullseye
base_image: '--platform=linux/arm/v7 arm32v7/node:18-bookworm'

# Rebuild .node modules for amv7
run: |
Expand All @@ -55,8 +55,8 @@ jobs:
mkdir -p ~/.cache/pkg
export PKG_CACHE_PATH=~/.cache/pkg
export PKG_IGNORE_TAG=true
curl https://github.com/yao-pkg/pkg-binaries/releases/download/node18/built-v18.18.2-linux-armv7 -LOJ
mv built-v18.18.2-linux-armv7 $PKG_CACHE_PATH/built-v${{ matrix.node-version }}-linux-armv7
curl https://github.com/yao-pkg/pkg-binaries/releases/download/node18/built-v18.19.1-linux-armv7 -LOJ
mv built-v18.19.1-linux-armv7 $PKG_CACHE_PATH/built-v${{ matrix.node-version }}-linux-armv7
npm run pkg -- --bundle --skip-build --arch=armv7
- name: Upload artifacts
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-it.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ jobs:
node-version: [18.x]
steps:
- name: Checkout master
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: 'master'
fetch-depth: 0 # fetch all commits history to create the changelog
token: ${{ secrets.BOT_TOKEN }}

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3.6.0
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-dep.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Use Node.js 20
uses: actions/setup-node@v3.6.0
uses: actions/setup-node@v4
with:
node-version: 20.x
cache: 'npm'
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/zwave-js-bot_comment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

steps:
- name: Checkout master branch
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: trusted

Expand Down Expand Up @@ -62,7 +62,7 @@ jobs:
if: |
steps.check-permissions.outputs.result == 'true' &&
!fromJSON(steps.pr-info.outputs.result).pending
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
token: ${{secrets.BOT_TOKEN}}
repository: ${{ fromJSON(steps.pr-info.outputs.result).repoName }}
Expand Down Expand Up @@ -124,7 +124,7 @@ jobs:

steps:
- name: Checkout master branch
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Check user's permissions to do this
id: check-permissions
Expand Down Expand Up @@ -164,7 +164,7 @@ jobs:
- name: Checkout pull request
if: steps.check-permissions.outputs.result == 'true'
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
token: ${{secrets.BOT_TOKEN}}
repository: ${{ fromJSON(steps.get-pr.outputs.result).head.repo.full_name }}
Expand Down Expand Up @@ -220,7 +220,7 @@ jobs:

steps:
- name: Checkout master branch
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Check permissions and necessity
id: check-permissions
Expand Down Expand Up @@ -253,7 +253,7 @@ jobs:
- name: Checkout pull request
if: steps.check-permissions.outputs.result == 'true'
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0 # Fetch the history, or this action will break everything!
token: ${{secrets.BOT_TOKEN}}
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@


## [9.14.6](https://github.com/zwave-js/zwave-js-ui/compare/v9.14.5...v9.14.6) (2024-07-11)


### Features

* bump [email protected] ([#3806](https://github.com/zwave-js/zwave-js-ui/issues/3806)) ([5078b55](https://github.com/zwave-js/zwave-js-ui/commit/5078b55b38823e533763265188bbfa1bf2fcc2ad))

## [9.14.5](https://github.com/zwave-js/zwave-js-ui/compare/v9.14.4...v9.14.5) (2024-07-09)


Expand Down
4 changes: 1 addition & 3 deletions api/lib/ZnifferManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -215,9 +215,7 @@ export default class ZnifferManager extends TypedEventEmitter<ZnifferManagerEven

private ccToLogRecord(commandClass: CommandClass): Record<string, any> {
try {
const parsed: Record<string, any> = commandClass.toLogEntry(
this.zniffer as any,
)
const parsed: Record<string, any> = commandClass.toLogEntry()

if (isEncapsulatingCommandClass(commandClass)) {
parsed.encapsulated = [
Expand Down
2 changes: 1 addition & 1 deletion nodemon.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"watch": ["**/*.ts", "package.json", "tsconfig.json", "../node-zwave-js/packages/*/build/**/*.js"],
"watch": ["**/*.ts", "package.json", "tsconfig.json"],
"ext": "ts,json,js",
"ignore": ["pkg", "store", "node_modules", "src", "dist", "server"],
"exec": "node --inspect=7004 --trace-warnings -r ./esbuild-register api/bin/www.ts"
Expand Down
Loading

0 comments on commit b393799

Please sign in to comment.