Merge branch 'master' into fix_update_links

balena-io · Oct 10, 2024 · f816716 · f816716
2 parents 178bc52 + 4375b96
commit f816716
Show file tree

Hide file tree

Showing 10 changed files with 196 additions and 24 deletions.
diff --git 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

diff --git 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 i -D 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/.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"
diff --git a/.versionbot/CHANGELOG.yml b/.versionbot/CHANGELOG.yml
@@ -1,3 +1,103 @@
+- 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
+      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 <[email protected]>
+        signed-off-by: Richard Glidden <[email protected]>
+      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
+      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
+      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
+      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
+      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
+      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
@@ -3,6 +3,43 @@
 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)
+
+* patch: etcher-util is corrupted in RPM package [Richard Glidden]
+
+# v1.19.23
+## (2024-10-09)
+
+* patch: remove gconf2 libgconf-2-4 deps [Marc-Aurèle Brothier]
+
+# v1.19.22
+## (2024-07-18)
+
+* Replace deprecated Flowzone inputs [Kyle Harding]
+
+# 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)
+
+* patch: fix missing windows dependency [Edwin Joassart]
+
+# v1.19.19
+## (2024-05-28)
+
+* patch: add sentry debug flag [Edwin Joassart]
+
 # v1.19.18
 ## (2024-05-22)
 

diff --git 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
 

diff --git 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
@@ -121,6 +121,7 @@ const initSentryMain = once(() => {
 	SentryMain.init({
 		dsn,
 		beforeSend: anonymizeSentryData,
+		debug: process.env.ETCHER_SENTRY_DEBUG === 'true',
 	});
 	console.log(SentryMain.getCurrentScope());
 });

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "private": true,
   "displayName": "balenaEtcher",
   "productName": "balenaEtcher",
-  "version": "1.19.18",
+  "version": "1.19.25",
   "packageType": "local",
   "main": ".webpack/main",
   "description": "Flash OS images to SD cards and USB drives, safely and easily.",
@@ -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",
@@ -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",
@@ -147,10 +144,11 @@
     "node": ">=20 <21"
   },
   "versionist": {
-    "publishedAt": "2024-05-22T13:28:04.201Z"
+    "publishedAt": "2024-10-10T10:03:29.992Z"
   },
   "optionalDependencies": {
     "bufferutil": "^4.0.8",
-    "utf-8-validate": "^5.0.10"
+    "utf-8-validate": "^5.0.10",
+    "winusb-driver-generator": "2.1.2"
   }
 }