From 77397a985dcb4b9f4d302cb7be5011034ff0bc61 Mon Sep 17 00:00:00 2001 From: Ben <43026681+bwp91@users.noreply.github.com> Date: Fri, 22 Sep 2023 02:34:50 +0100 Subject: [PATCH 1/4] main -> latest --- .github/workflows/beta-release.yml | 6 +++--- .github/workflows/build.yml | 6 +++--- .github/workflows/codeql-analysis.yml | 6 +++--- .github/workflows/pr-labeler.yml | 2 +- .github/workflows/release.yml | 4 ++-- .github/workflows/stale.yml | 2 +- CONTRIBUTING.md | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/beta-release.yml b/.github/workflows/beta-release.yml index 59d4c384a..fa2578f25 100644 --- a/.github/workflows/beta-release.yml +++ b/.github/workflows/beta-release.yml @@ -7,7 +7,7 @@ on: jobs: build_and_test: - uses: homebridge/.github/.github/workflows/nodejs-build-and-test.yml@main + uses: homebridge/.github/.github/workflows/nodejs-build-and-test.yml@latest with: enable_coverage: true install_cmd: npm ci && cd ui && npm ci @@ -16,7 +16,7 @@ jobs: lint: needs: build_and_test - uses: homebridge/.github/.github/workflows/eslint.yml@main + uses: homebridge/.github/.github/workflows/eslint.yml@latest with: install_cmd: npm ci && cd ui && npm ci @@ -25,7 +25,7 @@ jobs: if: ${{ github.repository == 'homebridge/homebridge-config-ui-x' }} - uses: homebridge/.github/.github/workflows/npm-publish.yml@main + uses: homebridge/.github/.github/workflows/npm-publish.yml@latest with: tag: 'test' dynamically_adjust_version: true diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 31a73476a..525a55124 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,7 +2,7 @@ name: Node Build on: push: - branches: [main] + branches: [latest] pull_request: workflow_dispatch: @@ -13,7 +13,7 @@ jobs: matrix: os: [ubuntu-latest, macos-latest, windows-2019] - uses: homebridge/.github/.github/workflows/nodejs-build-and-test.yml@main + uses: homebridge/.github/.github/workflows/nodejs-build-and-test.yml@latest with: enable_coverage: true runs_on: ${{ matrix.os }} @@ -90,6 +90,6 @@ jobs: lint: needs: build_and_test - uses: homebridge/.github/.github/workflows/eslint.yml@main + uses: homebridge/.github/.github/workflows/eslint.yml@latest with: install_cmd: npm ci && cd ui && npm ci diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index a7af70ba6..a3faf80d9 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -2,12 +2,12 @@ name: "CodeQL" on: push: - branches: [ main, beta* ] + branches: [ latest, beta* ] pull_request: - branches: [ main, beta* ] + branches: [ latest, beta* ] schedule: - cron: '17 9 * * 2' jobs: analyze: - uses: homebridge/.github/.github/workflows/codeql-analysis.yml@main + uses: homebridge/.github/.github/workflows/codeql-analysis.yml@latest diff --git a/.github/workflows/pr-labeler.yml b/.github/workflows/pr-labeler.yml index 08c043112..8b606ea02 100644 --- a/.github/workflows/pr-labeler.yml +++ b/.github/workflows/pr-labeler.yml @@ -7,6 +7,6 @@ on: jobs: stale: - uses: homebridge/.github/.github/workflows/pr-labeler.yml@main + uses: homebridge/.github/.github/workflows/pr-labeler.yml@latest secrets: token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fb9b6a61d..55d03fd64 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,7 +8,7 @@ on: jobs: build_and_test: - uses: homebridge/.github/.github/workflows/nodejs-build-and-test.yml@main + uses: homebridge/.github/.github/workflows/nodejs-build-and-test.yml@latest with: enable_coverage: true install_cmd: npm ci && cd ui && npm ci @@ -20,7 +20,7 @@ jobs: if: ${{ github.repository == 'homebridge/homebridge-config-ui-x' }} - uses: homebridge/.github/.github/workflows/npm-publish.yml@main + uses: homebridge/.github/.github/workflows/npm-publish.yml@latest with: install_cmd: npm ci && cd ui && npm ci secrets: diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 3a333183b..2683a78a4 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -7,6 +7,6 @@ on: jobs: stale: - uses: homebridge/.github/.github/workflows/stale.yml@main + uses: homebridge/.github/.github/workflows/stale.yml@latest secrets: token: ${{ secrets.GITHUB_TOKEN }} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8601e6e22..5fc4d4168 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -72,4 +72,4 @@ npm run test Additional language translations, or improvements to existing translations are most welcome. Translations can be found here: -https://github.com/homebridge/homebridge-config-ui-x/tree/main/ui/src/i18n +https://github.com/homebridge/homebridge-config-ui-x/tree/latest/ui/src/i18n From 79718ca83d3f7d1e14b3f5456b56035901916798 Mon Sep 17 00:00:00 2001 From: Ben <43026681+bwp91@users.noreply.github.com> Date: Sat, 23 Sep 2023 20:57:50 +0100 Subject: [PATCH 2/4] Revert "main -> latest" This reverts commit 77397a985dcb4b9f4d302cb7be5011034ff0bc61. --- .github/workflows/beta-release.yml | 6 +++--- .github/workflows/build.yml | 6 +++--- .github/workflows/codeql-analysis.yml | 6 +++--- .github/workflows/pr-labeler.yml | 2 +- .github/workflows/release.yml | 4 ++-- .github/workflows/stale.yml | 2 +- CONTRIBUTING.md | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/beta-release.yml b/.github/workflows/beta-release.yml index fa2578f25..59d4c384a 100644 --- a/.github/workflows/beta-release.yml +++ b/.github/workflows/beta-release.yml @@ -7,7 +7,7 @@ on: jobs: build_and_test: - uses: homebridge/.github/.github/workflows/nodejs-build-and-test.yml@latest + uses: homebridge/.github/.github/workflows/nodejs-build-and-test.yml@main with: enable_coverage: true install_cmd: npm ci && cd ui && npm ci @@ -16,7 +16,7 @@ jobs: lint: needs: build_and_test - uses: homebridge/.github/.github/workflows/eslint.yml@latest + uses: homebridge/.github/.github/workflows/eslint.yml@main with: install_cmd: npm ci && cd ui && npm ci @@ -25,7 +25,7 @@ jobs: if: ${{ github.repository == 'homebridge/homebridge-config-ui-x' }} - uses: homebridge/.github/.github/workflows/npm-publish.yml@latest + uses: homebridge/.github/.github/workflows/npm-publish.yml@main with: tag: 'test' dynamically_adjust_version: true diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 525a55124..31a73476a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,7 +2,7 @@ name: Node Build on: push: - branches: [latest] + branches: [main] pull_request: workflow_dispatch: @@ -13,7 +13,7 @@ jobs: matrix: os: [ubuntu-latest, macos-latest, windows-2019] - uses: homebridge/.github/.github/workflows/nodejs-build-and-test.yml@latest + uses: homebridge/.github/.github/workflows/nodejs-build-and-test.yml@main with: enable_coverage: true runs_on: ${{ matrix.os }} @@ -90,6 +90,6 @@ jobs: lint: needs: build_and_test - uses: homebridge/.github/.github/workflows/eslint.yml@latest + uses: homebridge/.github/.github/workflows/eslint.yml@main with: install_cmd: npm ci && cd ui && npm ci diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index a3faf80d9..a7af70ba6 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -2,12 +2,12 @@ name: "CodeQL" on: push: - branches: [ latest, beta* ] + branches: [ main, beta* ] pull_request: - branches: [ latest, beta* ] + branches: [ main, beta* ] schedule: - cron: '17 9 * * 2' jobs: analyze: - uses: homebridge/.github/.github/workflows/codeql-analysis.yml@latest + uses: homebridge/.github/.github/workflows/codeql-analysis.yml@main diff --git a/.github/workflows/pr-labeler.yml b/.github/workflows/pr-labeler.yml index 8b606ea02..08c043112 100644 --- a/.github/workflows/pr-labeler.yml +++ b/.github/workflows/pr-labeler.yml @@ -7,6 +7,6 @@ on: jobs: stale: - uses: homebridge/.github/.github/workflows/pr-labeler.yml@latest + uses: homebridge/.github/.github/workflows/pr-labeler.yml@main secrets: token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 55d03fd64..fb9b6a61d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,7 +8,7 @@ on: jobs: build_and_test: - uses: homebridge/.github/.github/workflows/nodejs-build-and-test.yml@latest + uses: homebridge/.github/.github/workflows/nodejs-build-and-test.yml@main with: enable_coverage: true install_cmd: npm ci && cd ui && npm ci @@ -20,7 +20,7 @@ jobs: if: ${{ github.repository == 'homebridge/homebridge-config-ui-x' }} - uses: homebridge/.github/.github/workflows/npm-publish.yml@latest + uses: homebridge/.github/.github/workflows/npm-publish.yml@main with: install_cmd: npm ci && cd ui && npm ci secrets: diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 2683a78a4..3a333183b 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -7,6 +7,6 @@ on: jobs: stale: - uses: homebridge/.github/.github/workflows/stale.yml@latest + uses: homebridge/.github/.github/workflows/stale.yml@main secrets: token: ${{ secrets.GITHUB_TOKEN }} diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5fc4d4168..8601e6e22 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -72,4 +72,4 @@ npm run test Additional language translations, or improvements to existing translations are most welcome. Translations can be found here: -https://github.com/homebridge/homebridge-config-ui-x/tree/latest/ui/src/i18n +https://github.com/homebridge/homebridge-config-ui-x/tree/main/ui/src/i18n From bc5a1e2d559610f2b14bb29faf0919dac6f1c6cd Mon Sep 17 00:00:00 2001 From: Ben <43026681+bwp91@users.noreply.github.com> Date: Sat, 23 Sep 2023 21:02:16 +0100 Subject: [PATCH 3/4] Update package.json --- ui/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/package.json b/ui/package.json index 2d797c227..516bc52b3 100644 --- a/ui/package.json +++ b/ui/package.json @@ -21,7 +21,7 @@ "@angular/platform-browser-dynamic": "^14.1.1", "@angular/router": "^14.1.1", "@auth0/angular-jwt": "^5.0.2", - "@homebridge/plugin-ui-utils": "0.0.19", + "@homebridge/plugin-ui-utils": "0.1.0", "@ng-bootstrap/ng-bootstrap": "^11.0.1", "@ngx-translate/core": "^14.0.0", "@ngx-translate/http-loader": "^7.0.0", @@ -92,4 +92,4 @@ "rxjs": "^7.4.0", "marked": "^4.0.13" } -} \ No newline at end of file +} From af499378588fc1e68804a654e68bbaa029a4f68a Mon Sep 17 00:00:00 2001 From: Ben <43026681+bwp91@users.noreply.github.com> Date: Sun, 24 Sep 2023 16:26:37 +0100 Subject: [PATCH 4/4] systeminformation (#1561) --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6f6ad801d..0499a1923 100644 --- a/package-lock.json +++ b/package-lock.json @@ -50,7 +50,7 @@ "reflect-metadata": "0.1.13", "rxjs": "7.5.6", "semver": "7.3.7", - "systeminformation": "5.12.3", + "systeminformation": "5.16.9", "tail": "2.2.4", "tar": "6.1.11", "tcp-port-used": "1.0.2", @@ -8720,9 +8720,9 @@ "integrity": "sha512-jHL6UyIYpvEI7NsuWd0R3hJaPQTg6Oo4qSBo+oVfOEkv6rrQm/475RGSMmZgV6ajp+Sgrp9CqrDjQYAgQqiv1A==" }, "node_modules/systeminformation": { - "version": "5.12.3", - "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.12.3.tgz", - "integrity": "sha512-aPyTDzK/VjEheGEODprxFTMahIWTHGyWXxTsh9EOHjeekVltrIWrle4dOZouOlOYgtKM1pDoHkrR+IssgYCK/A==", + "version": "5.16.9", + "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.16.9.tgz", + "integrity": "sha512-QTlv3GGSromPeLVW3pzM6uxU8RbkacW9e0+ZX23GAXaX+XE0UToSygAxCJDHSty6RB9lAFHCHg+FfiXFChi/+w==", "os": [ "darwin", "linux", @@ -16295,9 +16295,9 @@ "integrity": "sha512-jHL6UyIYpvEI7NsuWd0R3hJaPQTg6Oo4qSBo+oVfOEkv6rrQm/475RGSMmZgV6ajp+Sgrp9CqrDjQYAgQqiv1A==" }, "systeminformation": { - "version": "5.12.3", - "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.12.3.tgz", - "integrity": "sha512-aPyTDzK/VjEheGEODprxFTMahIWTHGyWXxTsh9EOHjeekVltrIWrle4dOZouOlOYgtKM1pDoHkrR+IssgYCK/A==" + "version": "5.16.9", + "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.16.9.tgz", + "integrity": "sha512-QTlv3GGSromPeLVW3pzM6uxU8RbkacW9e0+ZX23GAXaX+XE0UToSygAxCJDHSty6RB9lAFHCHg+FfiXFChi/+w==" }, "tail": { "version": "2.2.4", diff --git a/package.json b/package.json index 2740293bc..088d59e87 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,7 @@ "reflect-metadata": "0.1.13", "rxjs": "7.5.6", "semver": "7.3.7", - "systeminformation": "5.12.3", + "systeminformation": "5.16.9", "tail": "2.2.4", "tar": "6.1.11", "tcp-port-used": "1.0.2",