From fa3471d1936db1af70842fe5ea41fc473af82afa Mon Sep 17 00:00:00 2001 From: bugsounet Date: Tue, 11 Jun 2024 18:56:50 +0200 Subject: [PATCH 1/6] =?UTF-8?q?delete=20node=20v18=20in=20test=20suite=20/?= =?UTF-8?q?/=20use=20node=20v20=20in=20MM=C2=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/automated-tests.yaml | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/automated-tests.yaml b/.github/workflows/automated-tests.yaml index 18795146b6..301b08d47b 100644 --- a/.github/workflows/automated-tests.yaml +++ b/.github/workflows/automated-tests.yaml @@ -18,7 +18,7 @@ jobs: timeout-minutes: 30 strategy: matrix: - node-version: [18.x, 20.x, 22.x] + node-version: [20.x, 22.x] steps: - name: "Checkout code" uses: actions/checkout@v4 diff --git a/package.json b/package.json index 25c4622f58..c7aebff9d5 100644 --- a/package.json +++ b/package.json @@ -95,7 +95,7 @@ "electron": "^30.1.0" }, "engines": { - "node": ">=18" + "node": ">=20" }, "_moduleAliases": { "node_helper": "js/node_helper.js", From 84ff5142933969b60b984585f082fb0f40bfedf6 Mon Sep 17 00:00:00 2001 From: bugsounet Date: Tue, 11 Jun 2024 18:59:42 +0200 Subject: [PATCH 2/6] add changelog entry --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 10edb8aaa6..e37ab714f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,9 +13,12 @@ _This release is scheduled to be released on 2024-07-01._ ### Removed +- [test suite] delete node v18 support + ### Updated - [chore] Update dependencies including electron to v30 +- [core] use node >= v20 ### Fixed From 0a7534c4fd557b77a6c8516d7eefeb7a9b7f8a69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bugsounet=20-=20C=C3=A9dric?= Date: Tue, 11 Jun 2024 19:05:25 +0200 Subject: [PATCH 3/6] Update electronRebuild.yaml --- .github/workflows/electronRebuild.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/electronRebuild.yaml b/.github/workflows/electronRebuild.yaml index 5c6e3f7db3..e9ef70c24b 100644 --- a/.github/workflows/electronRebuild.yaml +++ b/.github/workflows/electronRebuild.yaml @@ -6,6 +6,9 @@ jobs: rebuild: name: Run electron-rebuild runs-on: ubuntu-latest + strategy: + matrix: + node-version: [20.x, 22.x] steps: - name: Checkout code uses: actions/checkout@v4 From d4ee12d783de0808523c8b84aa2ea0d0ee12ab78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bugsounet=20-=20C=C3=A9dric?= Date: Tue, 11 Jun 2024 19:12:14 +0200 Subject: [PATCH 4/6] Update electronRebuild.yaml --- .github/workflows/electronRebuild.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/electronRebuild.yaml b/.github/workflows/electronRebuild.yaml index e9ef70c24b..554ea12313 100644 --- a/.github/workflows/electronRebuild.yaml +++ b/.github/workflows/electronRebuild.yaml @@ -12,6 +12,10 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v4 + - name: "Use Node.js ${{ matrix.node-version }}" + uses: actions/setup-node@v4 + with: + node-version: ${{ matrix.node-version }} - name: Install MagicMirror run: npm run install-mm - name: Install @electron/rebuild From 2571d262206e3003756708e101896b01eea49067 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bugsounet=20-=20C=C3=A9dric?= Date: Tue, 11 Jun 2024 19:20:55 +0200 Subject: [PATCH 5/6] Update electronRebuild.yaml test with enable `check-latest` --- .github/workflows/electronRebuild.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/electronRebuild.yaml b/.github/workflows/electronRebuild.yaml index 554ea12313..f9cc50957f 100644 --- a/.github/workflows/electronRebuild.yaml +++ b/.github/workflows/electronRebuild.yaml @@ -16,6 +16,7 @@ jobs: uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} + check-latest: true - name: Install MagicMirror run: npm run install-mm - name: Install @electron/rebuild From a5ea5dcda9d5335ca6feb7cf1e0ee96ec5b48b5a Mon Sep 17 00:00:00 2001 From: bugsounet Date: Tue, 11 Jun 2024 19:35:42 +0200 Subject: [PATCH 6/6] test electron v31 --- package-lock.json | 11 ++++++----- package.json | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5b6eaf2976..b03aed2cd0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,6 +12,7 @@ "dependencies": { "ansis": "^3.2.0", "console-stamp": "^3.1.2", + "electron": "^31.0.0", "envsub": "^4.1.0", "eslint": "^8.57.0", "express": "^4.19.2", @@ -48,10 +49,10 @@ "stylelint-prettier": "^5.0.0" }, "engines": { - "node": ">=18" + "node": ">=20" }, "optionalDependencies": { - "electron": "^30.1.0" + "electron": "^31.0.0" } }, "node_modules/@ampproject/remapping": { @@ -3784,9 +3785,9 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "node_modules/electron": { - "version": "30.1.0", - "resolved": "https://registry.npmjs.org/electron/-/electron-30.1.0.tgz", - "integrity": "sha512-9O8m7kinjwMH5Df0hpXbwUaqI6pk3aJm1sKQUkQGCF7NDbNkGhu2BXgqaicPU6oe26zQPc5vtwWnHmiKlh1hYA==", + "version": "31.0.0", + "resolved": "https://registry.npmjs.org/electron/-/electron-31.0.0.tgz", + "integrity": "sha512-yJMhwu5NVqor7h5mt65uKtBsjSAD7NiRwNCigK8xAlJMaP0X2FKipEzQocOzusy7E0dny4gkTgOTATy+ucDtjw==", "hasInstallScript": true, "optional": true, "dependencies": { diff --git a/package.json b/package.json index c7aebff9d5..e0d7ba0f7c 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,7 @@ "stylelint-prettier": "^5.0.0" }, "optionalDependencies": { - "electron": "^30.1.0" + "electron": "^31.0.0" }, "engines": { "node": ">=20"