From 8223130e8dfce180481550d77f022064255601e4 Mon Sep 17 00:00:00 2001 From: Edwin Joassart Date: Tue, 28 May 2024 12:21:50 +0200 Subject: [PATCH 01/17] patch: add sentry debug flag --- lib/gui/app/modules/analytics.ts | 6 +++++- lib/gui/etcher.ts | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/gui/app/modules/analytics.ts b/lib/gui/app/modules/analytics.ts index 264a8c4b34..4ccc4d670e 100644 --- a/lib/gui/app/modules/analytics.ts +++ b/lib/gui/app/modules/analytics.ts @@ -122,7 +122,11 @@ let analyticsClient: Client; export const initAnalytics = once(() => { const dsn = settings.getSync('analyticsSentryToken') || process.env.SENTRY_TOKEN; - SentryRenderer.init({ dsn, beforeSend: anonymizeSentryData }); + SentryRenderer.init({ + dsn, + beforeSend: anonymizeSentryData, + debug: process.env.ETCHER_SENTRY_DEBUG === 'true', + }); const projectName = settings.getSync('analyticsAmplitudeToken') || process.env.AMPLITUDE_TOKEN; diff --git a/lib/gui/etcher.ts b/lib/gui/etcher.ts index 6c5dc7b505..6dc3fe7748 100644 --- a/lib/gui/etcher.ts +++ b/lib/gui/etcher.ts @@ -121,6 +121,7 @@ const initSentryMain = once(() => { SentryMain.init({ dsn, beforeSend: anonymizeSentryData, + debug: process.env.ETCHER_SENTRY_DEBUG === 'true', }); console.log(SentryMain.getCurrentScope()); }); From 6d796df01740e4625e8c303938fd85452d67343e Mon Sep 17 00:00:00 2001 From: "flowzone-app[bot]" <124931076+flowzone-app[bot]@users.noreply.github.com> Date: Tue, 28 May 2024 12:10:03 +0000 Subject: [PATCH 02/17] v1.19.19 --- .versionbot/CHANGELOG.yml | 10 ++++++++++ CHANGELOG.md | 5 +++++ npm-shrinkwrap.json | 4 ++-- package.json | 4 ++-- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/.versionbot/CHANGELOG.yml b/.versionbot/CHANGELOG.yml index 9f4915f373..8d2647e01a 100644 --- a/.versionbot/CHANGELOG.yml +++ b/.versionbot/CHANGELOG.yml @@ -1,3 +1,13 @@ +- commits: + - subject: "patch: add sentry debug flag" + hash: 8223130e8dfce180481550d77f022064255601e4 + body: "" + footer: {} + author: Edwin Joassart + nested: [] + version: 1.19.19 + title: "" + date: 2024-05-28T12:09:51.167Z - commits: - subject: "patch: fix Sentry DSN for main process" hash: 4ffda6e208a6e2f109f652d39e1248bec23a2ddf diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f85785f9d..cc7924f36c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +# v1.19.19 +## (2024-05-28) + +* patch: add sentry debug flag [Edwin Joassart] + # v1.19.18 ## (2024-05-22) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index cdd6a76a14..1edcb34e4a 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,12 +1,12 @@ { "name": "balena-etcher", - "version": "1.19.18", + "version": "1.19.19", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "balena-etcher", - "version": "1.19.18", + "version": "1.19.19", "license": "Apache-2.0", "dependencies": { "@electron/remote": "^2.1.2", diff --git a/package.json b/package.json index 0b55722070..9b990147f8 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "private": true, "displayName": "balenaEtcher", "productName": "balenaEtcher", - "version": "1.19.18", + "version": "1.19.19", "packageType": "local", "main": ".webpack/main", "description": "Flash OS images to SD cards and USB drives, safely and easily.", @@ -147,7 +147,7 @@ "node": ">=20 <21" }, "versionist": { - "publishedAt": "2024-05-22T13:28:04.201Z" + "publishedAt": "2024-05-28T12:09:51.644Z" }, "optionalDependencies": { "bufferutil": "^4.0.8", From c4d3f8db8769418925a9909ac700edc5f425a068 Mon Sep 17 00:00:00 2001 From: Edwin Joassart Date: Thu, 30 May 2024 11:44:50 +0200 Subject: [PATCH 03/17] patch: fix missing windows dependency --- .github/actions/test/action.yml | 6 ++++++ npm-shrinkwrap.json | 3 ++- package.json | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/actions/test/action.yml b/.github/actions/test/action.yml index 80841b7b83..e4af64d0d3 100644 --- a/.github/actions/test/action.yml +++ b/.github/actions/test/action.yml @@ -55,6 +55,12 @@ runs: # fi npm ci + + # as the shrinkwrap might have been done on mac/linux, this is ensure the package is there for windows + if [[runner.os == 'Windows']]; then + npm install winusb-driver-generator + fi + npm run lint npm run package npm run wdio # test stage, note that it requires the package to be done first diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 1edcb34e4a..e08706090b 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -88,7 +88,8 @@ }, "optionalDependencies": { "bufferutil": "^4.0.8", - "utf-8-validate": "^5.0.10" + "utf-8-validate": "^5.0.10", + "winusb-driver-generator": "2.1.2" } }, "node_modules/@aashutoshrathi/word-wrap": { diff --git a/package.json b/package.json index 9b990147f8..51a3ad5734 100644 --- a/package.json +++ b/package.json @@ -151,6 +151,7 @@ }, "optionalDependencies": { "bufferutil": "^4.0.8", - "utf-8-validate": "^5.0.10" + "utf-8-validate": "^5.0.10", + "winusb-driver-generator": "2.1.2" } } From 52144f4a6e7e08a3b6f0375063bf763e3b2181de Mon Sep 17 00:00:00 2001 From: "flowzone-app[bot]" <124931076+flowzone-app[bot]@users.noreply.github.com> Date: Thu, 30 May 2024 10:17:34 +0000 Subject: [PATCH 04/17] v1.19.20 --- .versionbot/CHANGELOG.yml | 10 ++++++++++ CHANGELOG.md | 5 +++++ npm-shrinkwrap.json | 4 ++-- package.json | 4 ++-- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/.versionbot/CHANGELOG.yml b/.versionbot/CHANGELOG.yml index 8d2647e01a..b10d081d00 100644 --- a/.versionbot/CHANGELOG.yml +++ b/.versionbot/CHANGELOG.yml @@ -1,3 +1,13 @@ +- commits: + - subject: "patch: fix missing windows dependency" + hash: c4d3f8db8769418925a9909ac700edc5f425a068 + body: "" + footer: {} + author: Edwin Joassart + nested: [] + version: 1.19.20 + title: "" + date: 2024-05-30T10:17:29.075Z - commits: - subject: "patch: add sentry debug flag" hash: 8223130e8dfce180481550d77f022064255601e4 diff --git a/CHANGELOG.md b/CHANGELOG.md index cc7924f36c..da87defdf6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +# v1.19.20 +## (2024-05-30) + +* patch: fix missing windows dependency [Edwin Joassart] + # v1.19.19 ## (2024-05-28) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index e08706090b..1a74d572f2 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,12 +1,12 @@ { "name": "balena-etcher", - "version": "1.19.19", + "version": "1.19.20", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "balena-etcher", - "version": "1.19.19", + "version": "1.19.20", "license": "Apache-2.0", "dependencies": { "@electron/remote": "^2.1.2", diff --git a/package.json b/package.json index 51a3ad5734..8cddd030b9 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "private": true, "displayName": "balenaEtcher", "productName": "balenaEtcher", - "version": "1.19.19", + "version": "1.19.20", "packageType": "local", "main": ".webpack/main", "description": "Flash OS images to SD cards and USB drives, safely and easily.", @@ -147,7 +147,7 @@ "node": ">=20 <21" }, "versionist": { - "publishedAt": "2024-05-28T12:09:51.644Z" + "publishedAt": "2024-05-30T10:17:29.606Z" }, "optionalDependencies": { "bufferutil": "^4.0.8", From 98db4df0dc147e5fec9180c50f4e21acf1fd0a58 Mon Sep 17 00:00:00 2001 From: Edwin Joassart Date: Thu, 30 May 2024 14:33:35 +0200 Subject: [PATCH 05/17] patch: fix missing windows dependency --- .github/actions/test/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/test/action.yml b/.github/actions/test/action.yml index e4af64d0d3..e2e6c008df 100644 --- a/.github/actions/test/action.yml +++ b/.github/actions/test/action.yml @@ -57,7 +57,7 @@ runs: npm ci # as the shrinkwrap might have been done on mac/linux, this is ensure the package is there for windows - if [[runner.os == 'Windows']]; then + if [[ $RUNNER_OS == 'Windows']]; then npm install winusb-driver-generator fi From d28719daf249f2994acdf94b4bb7ea937ffcab9b Mon Sep 17 00:00:00 2001 From: Edwin Joassart Date: Thu, 30 May 2024 14:56:07 +0200 Subject: [PATCH 06/17] patch: fix missing windows dependency --- .github/actions/test/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/test/action.yml b/.github/actions/test/action.yml index e2e6c008df..c67a4b261e 100644 --- a/.github/actions/test/action.yml +++ b/.github/actions/test/action.yml @@ -57,7 +57,7 @@ runs: npm ci # as the shrinkwrap might have been done on mac/linux, this is ensure the package is there for windows - if [[ $RUNNER_OS == 'Windows']]; then + if [[ "$RUNNER_OS" == "Windows" ]]; then npm install winusb-driver-generator fi From 8dad81ae34b8d71f3d4f7151ee60717e6207ccd8 Mon Sep 17 00:00:00 2001 From: Edwin Joassart Date: Thu, 30 May 2024 16:28:56 +0200 Subject: [PATCH 07/17] patch: fix missing windows dependency --- .github/actions/test/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/test/action.yml b/.github/actions/test/action.yml index c67a4b261e..69d7b5a57a 100644 --- a/.github/actions/test/action.yml +++ b/.github/actions/test/action.yml @@ -58,7 +58,7 @@ runs: # as the shrinkwrap might have been done on mac/linux, this is ensure the package is there for windows if [[ "$RUNNER_OS" == "Windows" ]]; then - npm install winusb-driver-generator + npm i -D winusb-driver-generator fi npm run lint From c748c2a9c022d1d61b44e70202d073b00cdbd08c Mon Sep 17 00:00:00 2001 From: "flowzone-app[bot]" <124931076+flowzone-app[bot]@users.noreply.github.com> Date: Thu, 30 May 2024 15:00:39 +0000 Subject: [PATCH 08/17] v1.19.21 --- .versionbot/CHANGELOG.yml | 22 ++++++++++++++++++++++ CHANGELOG.md | 7 +++++++ npm-shrinkwrap.json | 4 ++-- package.json | 4 ++-- 4 files changed, 33 insertions(+), 4 deletions(-) diff --git a/.versionbot/CHANGELOG.yml b/.versionbot/CHANGELOG.yml index b10d081d00..f41d4c8742 100644 --- a/.versionbot/CHANGELOG.yml +++ b/.versionbot/CHANGELOG.yml @@ -1,3 +1,25 @@ +- commits: + - subject: "patch: fix missing windows dependency" + hash: 8dad81ae34b8d71f3d4f7151ee60717e6207ccd8 + body: "" + footer: {} + author: Edwin Joassart + nested: [] + - subject: "patch: fix missing windows dependency" + hash: d28719daf249f2994acdf94b4bb7ea937ffcab9b + body: "" + footer: {} + author: Edwin Joassart + nested: [] + - subject: "patch: fix missing windows dependency" + hash: 98db4df0dc147e5fec9180c50f4e21acf1fd0a58 + body: "" + footer: {} + author: Edwin Joassart + nested: [] + version: 1.19.21 + title: "" + date: 2024-05-30T15:00:35.706Z - commits: - subject: "patch: fix missing windows dependency" hash: c4d3f8db8769418925a9909ac700edc5f425a068 diff --git a/CHANGELOG.md b/CHANGELOG.md index da87defdf6..1faae51141 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +# v1.19.21 +## (2024-05-30) + +* patch: fix missing windows dependency [Edwin Joassart] +* patch: fix missing windows dependency [Edwin Joassart] +* patch: fix missing windows dependency [Edwin Joassart] + # v1.19.20 ## (2024-05-30) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 1a74d572f2..6f6334829e 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,12 +1,12 @@ { "name": "balena-etcher", - "version": "1.19.20", + "version": "1.19.21", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "balena-etcher", - "version": "1.19.20", + "version": "1.19.21", "license": "Apache-2.0", "dependencies": { "@electron/remote": "^2.1.2", diff --git a/package.json b/package.json index 8cddd030b9..18dfbcab96 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "private": true, "displayName": "balenaEtcher", "productName": "balenaEtcher", - "version": "1.19.20", + "version": "1.19.21", "packageType": "local", "main": ".webpack/main", "description": "Flash OS images to SD cards and USB drives, safely and easily.", @@ -147,7 +147,7 @@ "node": ">=20 <21" }, "versionist": { - "publishedAt": "2024-05-30T10:17:29.606Z" + "publishedAt": "2024-05-30T15:00:36.294Z" }, "optionalDependencies": { "bufferutil": "^4.0.8", From 52d396aa7ea9ae1ef6d68151f582f04f57191b14 Mon Sep 17 00:00:00 2001 From: Kyle Harding Date: Wed, 17 Jul 2024 09:37:12 -0400 Subject: [PATCH 09/17] Replace deprecated Flowzone inputs Change-type: patch --- .github/workflows/flowzone.yml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/.github/workflows/flowzone.yml b/.github/workflows/flowzone.yml index fe5caab9a5..7350dd8d1a 100644 --- a/.github/workflows/flowzone.yml +++ b/.github/workflows/flowzone.yml @@ -18,7 +18,24 @@ jobs: (github.event.pull_request.head.repo.full_name != github.repository && github.event_name == 'pull_request_target') secrets: inherit with: - custom_runs_on: '[["ubuntu-20.04"],["windows-2019"],["macos-12"],["macos-latest-xlarge"]]' + custom_test_matrix: > + { + "os": [ + ["ubuntu-20.04"], + ["windows-2019"], + ["macos-12"], + ["macos-latest-xlarge"] + ] + } + custom_publish_matrix: > + { + "os": [ + ["ubuntu-20.04"], + ["windows-2019"], + ["macos-12"], + ["macos-latest-xlarge"] + ] + } restrict_custom_actions: false github_prerelease: true cloudflare_website: "etcher" From 5fd6376f458e2c9e24af5c9703867ac2aea82e43 Mon Sep 17 00:00:00 2001 From: "flowzone-app[bot]" <124931076+flowzone-app[bot]@users.noreply.github.com> Date: Thu, 18 Jul 2024 18:13:00 +0000 Subject: [PATCH 10/17] v1.19.22 --- .versionbot/CHANGELOG.yml | 12 ++++++++++++ CHANGELOG.md | 5 +++++ npm-shrinkwrap.json | 4 ++-- package.json | 4 ++-- 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/.versionbot/CHANGELOG.yml b/.versionbot/CHANGELOG.yml index f41d4c8742..4718281253 100644 --- a/.versionbot/CHANGELOG.yml +++ b/.versionbot/CHANGELOG.yml @@ -1,3 +1,15 @@ +- commits: + - subject: Replace deprecated Flowzone inputs + hash: 52d396aa7ea9ae1ef6d68151f582f04f57191b14 + body: "" + footer: + Change-type: patch + change-type: patch + author: Kyle Harding + nested: [] + version: 1.19.22 + title: "" + date: 2024-07-18T18:12:56.368Z - commits: - subject: "patch: fix missing windows dependency" hash: 8dad81ae34b8d71f3d4f7151ee60717e6207ccd8 diff --git a/CHANGELOG.md b/CHANGELOG.md index 1faae51141..950e805d69 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +# v1.19.22 +## (2024-07-18) + +* Replace deprecated Flowzone inputs [Kyle Harding] + # v1.19.21 ## (2024-05-30) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 6f6334829e..dfd207d559 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,12 +1,12 @@ { "name": "balena-etcher", - "version": "1.19.21", + "version": "1.19.22", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "balena-etcher", - "version": "1.19.21", + "version": "1.19.22", "license": "Apache-2.0", "dependencies": { "@electron/remote": "^2.1.2", diff --git a/package.json b/package.json index 18dfbcab96..18b98b4ed3 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "private": true, "displayName": "balenaEtcher", "productName": "balenaEtcher", - "version": "1.19.21", + "version": "1.19.22", "packageType": "local", "main": ".webpack/main", "description": "Flash OS images to SD cards and USB drives, safely and easily.", @@ -147,7 +147,7 @@ "node": ">=20 <21" }, "versionist": { - "publishedAt": "2024-05-30T15:00:36.294Z" + "publishedAt": "2024-07-18T18:12:56.823Z" }, "optionalDependencies": { "bufferutil": "^4.0.8", From 2ed779ef371db367e4e413c9d0d08fcd738edb5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Aur=C3=A8le=20Brothier?= Date: Thu, 16 May 2024 12:46:24 +0200 Subject: [PATCH 11/17] patch: remove gconf2 libgconf-2-4 deps Closes #4096 --- package.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/package.json b/package.json index 18b98b4ed3..9f41c7a58b 100644 --- a/package.json +++ b/package.json @@ -106,8 +106,6 @@ }, "hostDependencies": { "debian": [ - "gconf-service", - "gconf2", "libasound2", "libatk1.0-0", "libc6", @@ -119,7 +117,6 @@ "libfreetype6", "libgbm1", "libgcc1", - "libgconf-2-4", "libgdk-pixbuf2.0-0", "libglib2.0-0", "libgtk-3-0", From 9f408241f9c6fe4f34bb8839a928e79fb3bbb2e9 Mon Sep 17 00:00:00 2001 From: Edwin Joassart Date: Wed, 9 Oct 2024 13:55:44 +0200 Subject: [PATCH 12/17] remove gcconf2 deps from docs --- docs/USER-DOCUMENTATION.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/USER-DOCUMENTATION.md b/docs/USER-DOCUMENTATION.md index 3274b2029d..338292d030 100644 --- a/docs/USER-DOCUMENTATION.md +++ b/docs/USER-DOCUMENTATION.md @@ -122,7 +122,6 @@ run Etcher on a GNU/Linux system. - xrender - xtst - xscrnsaver -- gconf-2.0 - gmodule-2.0 - nss From 3dc17c89b409b41900f51dc57b15d44692157028 Mon Sep 17 00:00:00 2001 From: "flowzone-app[bot]" <124931076+flowzone-app[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2024 13:52:59 +0000 Subject: [PATCH 13/17] v1.19.23 --- .versionbot/CHANGELOG.yml | 10 ++++++++++ CHANGELOG.md | 5 +++++ npm-shrinkwrap.json | 4 ++-- package.json | 4 ++-- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/.versionbot/CHANGELOG.yml b/.versionbot/CHANGELOG.yml index 4718281253..aa6094a25c 100644 --- a/.versionbot/CHANGELOG.yml +++ b/.versionbot/CHANGELOG.yml @@ -1,3 +1,13 @@ +- commits: + - subject: "patch: remove gconf2 libgconf-2-4 deps" + hash: 2ed779ef371db367e4e413c9d0d08fcd738edb5b + body: "Closes #4096" + footer: {} + author: Marc-Aurèle Brothier + nested: [] + version: 1.19.23 + title: "" + date: 2024-10-09T13:52:54.936Z - commits: - subject: Replace deprecated Flowzone inputs hash: 52d396aa7ea9ae1ef6d68151f582f04f57191b14 diff --git a/CHANGELOG.md b/CHANGELOG.md index 950e805d69..6e81317a85 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +# v1.19.23 +## (2024-10-09) + +* patch: remove gconf2 libgconf-2-4 deps [Marc-Aurèle Brothier] + # v1.19.22 ## (2024-07-18) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index dfd207d559..be2bdafcde 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,12 +1,12 @@ { "name": "balena-etcher", - "version": "1.19.22", + "version": "1.19.23", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "balena-etcher", - "version": "1.19.22", + "version": "1.19.23", "license": "Apache-2.0", "dependencies": { "@electron/remote": "^2.1.2", diff --git a/package.json b/package.json index 9f41c7a58b..48bc3daefc 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "private": true, "displayName": "balenaEtcher", "productName": "balenaEtcher", - "version": "1.19.22", + "version": "1.19.23", "packageType": "local", "main": ".webpack/main", "description": "Flash OS images to SD cards and USB drives, safely and easily.", @@ -144,7 +144,7 @@ "node": ">=20 <21" }, "versionist": { - "publishedAt": "2024-07-18T18:12:56.823Z" + "publishedAt": "2024-10-09T13:52:55.406Z" }, "optionalDependencies": { "bufferutil": "^4.0.8", From e43ee788ec5ec49e105ff804206919bb10a59ea7 Mon Sep 17 00:00:00 2001 From: Richard Glidden Date: Sun, 25 Aug 2024 13:17:29 -0400 Subject: [PATCH 14/17] patch: etcher-util is corrupted in RPM package rpmbuild strips executables by default when generating an rpm packge. This was causing the JavaScript code bundled in the etcher-util file to be removed, causing "Pkg: Error reading from file." whenever etcher-util was called. This in turn caused balena-etcher to generate the error message `Error: (0, h.requestMetadata) is not a function` when attempting to write an SD card. This fixes the issue for RPM builds by replacing the `strip` command with `true` so that rpmbuild no longer strips the executables and the embeded code stays intact. See: https://github.com/balena-io/etcher/issues/4150 Signed-off-by: Richard Glidden --- .github/actions/publish/action.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/actions/publish/action.yml b/.github/actions/publish/action.yml index ae5dc5a89d..12b4ab7531 100644 --- a/.github/actions/publish/action.yml +++ b/.github/actions/publish/action.yml @@ -53,6 +53,13 @@ runs: shell: bash run: sudo apt-get install -y --no-install-recommends fakeroot dpkg rpm + # rpmbuild will strip binaries by default, which breaks the sidecar. + # Use a macro to override the "strip" to bypass stripping. + - name: Configure rpmbuild to not strip executables + if: runner.os == 'Linux' + shell: bash + run: echo '%__strip /usr/bin/true' > ~/.rpmmacros + - name: Install host dependencies if: runner.os == 'macOS' # FIXME: Python 3.12 dropped distutils that node-gyp depends upon. @@ -131,7 +138,7 @@ runs: PLATFORM=Windows SHA256SUM_BIN=sha256sum - # Install DigiCert Signing Manager Tools + # Install DigiCert Signing Manager Tools curl --silent --retry 3 --fail https://one.digicert.com/signingmanager/api-ui/v1/releases/smtools-windows-x64.msi/download \ -H "x-api-key:$SM_API_KEY" \ -o smtools-windows-x64.msi From 676eaf82e7caf383b901f0043b003ab42205d435 Mon Sep 17 00:00:00 2001 From: "flowzone-app[bot]" <124931076+flowzone-app[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2024 14:22:59 +0000 Subject: [PATCH 15/17] v1.19.24 --- .versionbot/CHANGELOG.yml | 26 ++++++++++++++++++++++++++ CHANGELOG.md | 5 +++++ npm-shrinkwrap.json | 4 ++-- package.json | 4 ++-- 4 files changed, 35 insertions(+), 4 deletions(-) diff --git a/.versionbot/CHANGELOG.yml b/.versionbot/CHANGELOG.yml index aa6094a25c..a3926b6425 100644 --- a/.versionbot/CHANGELOG.yml +++ b/.versionbot/CHANGELOG.yml @@ -1,3 +1,29 @@ +- commits: + - subject: "patch: etcher-util is corrupted in RPM package" + hash: e43ee788ec5ec49e105ff804206919bb10a59ea7 + body: | + rpmbuild strips executables by default when generating an rpm packge. + This was causing the JavaScript code bundled in the etcher-util file + to be removed, causing "Pkg: Error reading from file." whenever + etcher-util was called. + + This in turn caused balena-etcher to generate the error message + `Error: (0, h.requestMetadata) is not a function` when attempting + to write an SD card. + + This fixes the issue for RPM builds by replacing the `strip` command + with `true` so that rpmbuild no longer strips the executables and + the embeded code stays intact. + + See: https://github.com/balena-io/etcher/issues/4150 + footer: + Signed-off-by: Richard Glidden + signed-off-by: Richard Glidden + author: Richard Glidden + nested: [] + version: 1.19.24 + title: "" + date: 2024-10-09T14:22:56.623Z - commits: - subject: "patch: remove gconf2 libgconf-2-4 deps" hash: 2ed779ef371db367e4e413c9d0d08fcd738edb5b diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e81317a85..45ee83d8d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +# v1.19.24 +## (2024-10-09) + +* patch: etcher-util is corrupted in RPM package [Richard Glidden] + # v1.19.23 ## (2024-10-09) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index be2bdafcde..5fe5214c37 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,12 +1,12 @@ { "name": "balena-etcher", - "version": "1.19.23", + "version": "1.19.24", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "balena-etcher", - "version": "1.19.23", + "version": "1.19.24", "license": "Apache-2.0", "dependencies": { "@electron/remote": "^2.1.2", diff --git a/package.json b/package.json index 48bc3daefc..e03f3e249f 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "private": true, "displayName": "balenaEtcher", "productName": "balenaEtcher", - "version": "1.19.23", + "version": "1.19.24", "packageType": "local", "main": ".webpack/main", "description": "Flash OS images to SD cards and USB drives, safely and easily.", @@ -144,7 +144,7 @@ "node": ">=20 <21" }, "versionist": { - "publishedAt": "2024-10-09T13:52:55.406Z" + "publishedAt": "2024-10-09T14:22:57.084Z" }, "optionalDependencies": { "bufferutil": "^4.0.8", From c726b51dca3383c76f4bf824fd5d594ac3069180 Mon Sep 17 00:00:00 2001 From: Edwin Joassart Date: Wed, 9 Oct 2024 11:26:37 +0200 Subject: [PATCH 16/17] patch: bump etcher-sdk to 9.1.2 --- npm-shrinkwrap.json | 22 ++++++++++++---------- package.json | 2 +- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 5fe5214c37..6834013107 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -19,7 +19,7 @@ "drivelist": "^12.0.2", "electron-squirrel-startup": "^1.0.0", "electron-updater": "6.1.8", - "etcher-sdk": "9.0.11", + "etcher-sdk": "9.1.2", "i18next": "23.11.2", "immutable": "3.8.2", "lodash": "4.17.21", @@ -12955,9 +12955,10 @@ } }, "node_modules/etcher-sdk": { - "version": "9.0.11", - "resolved": "https://registry.npmjs.org/etcher-sdk/-/etcher-sdk-9.0.11.tgz", - "integrity": "sha512-pWE+gqciw8V/NUnu/ywDLOUZZFdayx7ZJdZd5KVqIkm3pgEfAlpPgvmMNDnP9+b6/UW2wPaLy6NS8EiaDqK7tQ==", + "version": "9.1.2", + "resolved": "https://registry.npmjs.org/etcher-sdk/-/etcher-sdk-9.1.2.tgz", + "integrity": "sha512-mFH8Q2CsqmPkWGjq7MX+WkN5ndGVBmtelYNjlB9E5nj3qXnNBBNbu3YR7P9s/Ft9HN73sKg5mP72xu/U0klG5Q==", + "license": "Apache-2.0", "dependencies": { "@balena/node-beaglebone-usbboot": "^3.0.0", "@balena/udif": "^1.1.2", @@ -12978,7 +12979,7 @@ "lzma-native": "^8.0.6", "minimatch": "^9.0.3", "mountutils": "^1.3.20", - "node-raspberrypi-usbboot": "1.0.7", + "node-raspberrypi-usbboot": "1.1.0", "outdent": "^0.8.0", "partitioninfo": "^6.0.2", "rwmutex": "^1.0.0", @@ -12990,7 +12991,7 @@ "zip-part-stream": "^2.0.0" }, "engines": { - "node": ">=18" + "node": ">=18 <22" }, "optionalDependencies": { "winusb-driver-generator": "^2.0.0" @@ -20407,12 +20408,13 @@ } }, "node_modules/node-raspberrypi-usbboot": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/node-raspberrypi-usbboot/-/node-raspberrypi-usbboot-1.0.7.tgz", - "integrity": "sha512-ebL2xC7GQSrbrbAdaj2P6rWCViDoh0ewsgu3gHrtOCNeioCZ6ESirUob1iXT/0DCCMqUDPZA0VV3+euCPRruJw==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/node-raspberrypi-usbboot/-/node-raspberrypi-usbboot-1.1.0.tgz", + "integrity": "sha512-X5+S+YO/jHcNosb+532shuSQAkaFrt9y0B+JiimTsH62gO+OenwBqWEEoVxrxr/fOtze30zPMe/66u/gA9WzhA==", + "license": "Apache-2.0", "dependencies": { "debug": "^4.3.4", - "usb": "^2.5.2" + "usb": "^2.12.1" } }, "node_modules/node-releases": { diff --git a/package.json b/package.json index e03f3e249f..a9a4f74376 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "drivelist": "^12.0.2", "electron-squirrel-startup": "^1.0.0", "electron-updater": "6.1.8", - "etcher-sdk": "9.0.11", + "etcher-sdk": "9.1.2", "i18next": "23.11.2", "immutable": "3.8.2", "lodash": "4.17.21", From 4375b960c290a89fc93c8e35f8fe4fdcf5dfe268 Mon Sep 17 00:00:00 2001 From: "flowzone-app[bot]" <124931076+flowzone-app[bot]@users.noreply.github.com> Date: Thu, 10 Oct 2024 10:03:36 +0000 Subject: [PATCH 17/17] v1.19.25 --- .versionbot/CHANGELOG.yml | 10 ++++++++++ CHANGELOG.md | 5 +++++ npm-shrinkwrap.json | 4 ++-- package.json | 4 ++-- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/.versionbot/CHANGELOG.yml b/.versionbot/CHANGELOG.yml index a3926b6425..a61563c86d 100644 --- a/.versionbot/CHANGELOG.yml +++ b/.versionbot/CHANGELOG.yml @@ -1,3 +1,13 @@ +- commits: + - subject: "patch: bump etcher-sdk to 9.1.2" + hash: c726b51dca3383c76f4bf824fd5d594ac3069180 + body: "" + footer: {} + author: Edwin Joassart + nested: [] + version: 1.19.25 + title: "" + date: 2024-10-10T10:03:29.519Z - commits: - subject: "patch: etcher-util is corrupted in RPM package" hash: e43ee788ec5ec49e105ff804206919bb10a59ea7 diff --git a/CHANGELOG.md b/CHANGELOG.md index 45ee83d8d7..562e690b0e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +# v1.19.25 +## (2024-10-10) + +* patch: bump etcher-sdk to 9.1.2 [Edwin Joassart] + # v1.19.24 ## (2024-10-09) diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 6834013107..d8954f61a4 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,12 +1,12 @@ { "name": "balena-etcher", - "version": "1.19.24", + "version": "1.19.25", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "balena-etcher", - "version": "1.19.24", + "version": "1.19.25", "license": "Apache-2.0", "dependencies": { "@electron/remote": "^2.1.2", diff --git a/package.json b/package.json index a9a4f74376..c1002059a8 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "private": true, "displayName": "balenaEtcher", "productName": "balenaEtcher", - "version": "1.19.24", + "version": "1.19.25", "packageType": "local", "main": ".webpack/main", "description": "Flash OS images to SD cards and USB drives, safely and easily.", @@ -144,7 +144,7 @@ "node": ">=20 <21" }, "versionist": { - "publishedAt": "2024-10-09T14:22:57.084Z" + "publishedAt": "2024-10-10T10:03:29.992Z" }, "optionalDependencies": { "bufferutil": "^4.0.8",