wip: ci tests

add-flash-with-etcher-to-docs

.versionbot/CHANGELOG.yml

@@ -1,3 +1,36 @@
+- commits:
+    - subject: add-flash-with-etcher-to-docs
+      hash: 856b426dc98925f5e339976a5cac144f4bb4ea59
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Lizzie Epton
+      nested: []
+  version: 1.18.6
+  title: ""
+  date: 2023-03-21T13:24:18.265Z
+- commits:
+    - subject: "patch: add apt-get update in flowzone preinstall"
+      hash: 0d9ac710880e6b9413b09e4c35a505034d1e9d51
+      body: libudev package has changed and cannot be installed if we not update apt
+        cache
+      footer: {}
+      author: Edwin Joassart
+      nested: []
+  version: 1.18.5
+  title: ""
+  date: 2023-03-09T11:30:34.540Z
+- commits:
+    - subject: "patch: bump etcher-sdk to 8.3.1"
+      hash: bf0360e7f46ac620f95021e0c48a3a04d302e725
+      body: ""
+      footer: {}
+      author: JOASSART Edwin
+      nested: []
+  version: 1.18.4
+  title: ""
+  date: 2023-03-02T17:31:31.788Z
 - commits:
     - subject: fix-typo
       hash: 496f131c4b024dfcd17fde5173016f70c0d0599c

CHANGELOG.md

@@ -3,6 +3,21 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+# v1.18.6
+## (2023-03-21)
+
+* add-flash-with-etcher-to-docs [Lizzie Epton]
+
+# v1.18.5
+## (2023-03-09)
+
+* patch: add apt-get update in flowzone preinstall [Edwin Joassart]
+
+# v1.18.4
+## (2023-03-02)
+
+* patch: bump etcher-sdk to 8.3.1 [JOASSART Edwin]
+
 # v1.18.3
 ## (2023-02-22)
 

afterPack.js

@@ -1,17 +1,20 @@
-'use strict'
+"use strict";
 
-const cp = require('child_process')
+const cp = require("child_process");
-const fs = require('fs')
+const fs = require("fs");
-const outdent = require('outdent')
+const outdent = require("outdent");
-const path = require('path')
+const path = require("path");
+const builder = require("electron-builder");
+const { flipFuses, FuseVersion, FuseV1Options } = require("@electron/fuses");
 
-exports.default = function(context) {
+exports.default = async function (context) {
-  if (context.packager.platform.name !== 'linux') {
+  if (context.packager.platform.name === "linux") {
-    return
+    const scriptPath = path.join(
-  }
+      context.appOutDir,
-  const scriptPath = path.join(context.appOutDir, context.packager.executableName)
+      context.packager.executableName
-  const binPath = scriptPath + '.bin'
+    );
-  cp.execFileSync('mv', [scriptPath, binPath])
+    const binPath = scriptPath + ".bin";
+    cp.execFileSync("mv", [scriptPath, binPath]);
     fs.writeFileSync(
       scriptPath,
       outdent({ trimTrailingNewline: false })`
@@ -26,6 +29,41 @@ exports.default = function(context) {
         "\${script_dir}"/${context.packager.executableName}.bin "$@" --no-sandbox
       fi
     `
-  )
+    );
-  cp.execFileSync('chmod', ['+x', scriptPath])
+    cp.execFileSync("chmod", ["+x", scriptPath]);
   }
+
+  // Adapted from https://github.com/electron-userland/electron-builder/issues/6365#issue-1033809141
+  const ext = {
+    darwin: ".app",
+    win32: ".exe",
+    linux: ".bin",
+  }[context.electronPlatformName];
+
+  const IS_LINUX = context.electronPlatformName === "linux";
+  const executableName = IS_LINUX
+    ? context.packager.appInfo.productFilename.toLowerCase().replace("-dev", "")
+    : context.packager.appInfo.productFilename; // .toLowerCase() to accomodate Linux file named `name` but productFileName is `Name` -- Replaces '-dev' because on Linux the executable name is `name` even for the DEV builds
+
+  const IS_APPLE_SILICON =
+    context.electronPlatformName === "darwin" &&
+    context.arch === builder.Arch.arm64;
+
+  const electronBinaryPath = path.join(
+    context.appOutDir,
+    `${executableName}${ext}`
+  );
+
+  console.log(electronBinaryPath);
+
+  await flipFuses(electronBinaryPath, {
+    version: FuseVersion.V1,
+    resetAdHocDarwinSignature: IS_APPLE_SILICON, // necessary for building on Apple Silicon
+    [FuseV1Options.RunAsNode]: false,
+    [FuseV1Options.EnableCookieEncryption]: true,
+    [FuseV1Options.EnableNodeOptionsEnvironmentVariable]: false,
+    [FuseV1Options.EnableNodeCliInspectArguments]: false,
+    // [FuseV1Options.EnableEmbeddedAsarIntegrityValidation]: true, // Only affects macOS builds, but breaks them -- https://github.com/electron/fuses/issues/7
+    [FuseV1Options.OnlyLoadAppFromAsar]: false,
+  });
+};

docs/FAQ.md

@@ -44,3 +44,9 @@ Etcher requires an available [polkit authentication agent](https://wiki.archlinu
 ## May I run Etcher in older macOS versions?
 
 Etcher GUI is based on the [Electron](http://electron.atom.io/) framework, [which only supports macOS 10.10 and newer versions](https://github.com/electron/electron/blob/master/docs/tutorial/support.md#supported-platforms).
+
+## Can I use the Flash With Etcher button on my site?
+
+You can use the Flash with Etcher button on your site or blog, if you have an OS that you want your users to be able to easily flash using Etcher, add the following code where you want to button to be:
+
+`<a href="https://efp.balena.io/open-image-url?imageUrl=<your image URL>"><img src="http://balena.io/flash-with-etcher.png" /></a>`

package-lock.json

@@ -1,17 +1,18 @@
 {
   "name": "balena-etcher",
-  "version": "1.18.3",
+  "version": "1.18.6",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "balena-etcher",
-      "version": "1.18.3",
+      "version": "1.18.6",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "devDependencies": {
         "@balena/lint": "5.4.2",
         "@balena/sudo-prompt": "9.2.1-workaround-windows-amperstand-in-username-0849e215b947987a643fe5763902aea201255534",
+        "@electron/fuses": "^1.6.1",
         "@electron/remote": "^2.0.9",
         "@fortawesome/fontawesome-free": "5.15.4",
         "@sentry/electron": "^4.1.2",
@@ -44,7 +45,7 @@
         "electron-rebuild": "^3.2.9",
         "electron-updater": "5.3.0",
         "esbuild-loader": "2.20.0",
-        "etcher-sdk": "^8.3.0",
+        "etcher-sdk": "8.3.1",
         "file-loader": "6.2.0",
         "husky": "4.3.8",
         "i18next": "21.10.0",
@@ -3151,6 +3152,135 @@
         "node": ">=10.0.0"
       }
     },
+    "node_modules/@electron/fuses": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/@electron/fuses/-/fuses-1.6.1.tgz",
+      "integrity": "sha512-J7kRMlc0vP03uzUuhHNEqffqZMZ6FRe0YGMOJO4kJObmYkOg38mMTvbbktEj+oteH5nfyhbQUkHIYnMSh7T/CQ==",
+      "dev": true,
+      "dependencies": {
+        "chalk": "^4.1.1",
+        "fs-extra": "^9.0.1",
+        "minimist": "^1.2.5"
+      },
+      "bin": {
+        "electron-fuses": "dist/bin.js"
+      }
+    },
+    "node_modules/@electron/fuses/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/@electron/fuses/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/@electron/fuses/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/@electron/fuses/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/@electron/fuses/node_modules/fs-extra": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+      "dev": true,
+      "dependencies": {
+        "at-least-node": "^1.0.0",
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@electron/fuses/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@electron/fuses/node_modules/jsonfile": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "dev": true,
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/@electron/fuses/node_modules/minimist": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/@electron/fuses/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@electron/fuses/node_modules/universalify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
     "node_modules/@electron/get": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/@electron/get/-/get-1.14.1.tgz",
@@ -10300,9 +10430,9 @@
       }
     },
     "node_modules/etcher-sdk": {
-      "version": "8.3.0",
+      "version": "8.3.1",
-      "resolved": "https://registry.npmjs.org/etcher-sdk/-/etcher-sdk-8.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/etcher-sdk/-/etcher-sdk-8.3.1.tgz",
-      "integrity": "sha512-ccxwTWtr/s2DWXX90wrBkWnKaCFYOpLknJk2crY6ZstvdSKuAp1EPGmPDiGucBFePV73yFbzoFTIPtk1LBbo4g==",
+      "integrity": "sha512-OM1cb+BTdVpzTJaUphj61HkMCmuos21Jlk9EIk8aiH1B+af47/0iiRmQ50tSynC52Z+c8GUkNKK+ofr5bUl3qg==",
       "dev": true,
       "dependencies": {
         "@balena/node-beaglebone-usbboot": "^3.0.0",
@@ -22772,6 +22902,102 @@
       "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
       "dev": true
     },
+    "@electron/fuses": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/@electron/fuses/-/fuses-1.6.1.tgz",
+      "integrity": "sha512-J7kRMlc0vP03uzUuhHNEqffqZMZ6FRe0YGMOJO4kJObmYkOg38mMTvbbktEj+oteH5nfyhbQUkHIYnMSh7T/CQ==",
+      "dev": true,
+      "requires": {
+        "chalk": "^4.1.1",
+        "fs-extra": "^9.0.1",
+        "minimist": "^1.2.5"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "fs-extra": {
+          "version": "9.1.0",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+          "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+          "dev": true,
+          "requires": {
+            "at-least-node": "^1.0.0",
+            "graceful-fs": "^4.2.0",
+            "jsonfile": "^6.0.1",
+            "universalify": "^2.0.0"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "jsonfile": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+          "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.6",
+            "universalify": "^2.0.0"
+          }
+        },
+        "minimist": {
+          "version": "1.2.8",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+          "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        },
+        "universalify": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+          "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+          "dev": true
+        }
+      }
+    },
     "@electron/get": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/@electron/get/-/get-1.14.1.tgz",
@@ -28468,9 +28694,9 @@
       "dev": true
     },
     "etcher-sdk": {
-      "version": "8.3.0",
+      "version": "8.3.1",
-      "resolved": "https://registry.npmjs.org/etcher-sdk/-/etcher-sdk-8.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/etcher-sdk/-/etcher-sdk-8.3.1.tgz",
-      "integrity": "sha512-ccxwTWtr/s2DWXX90wrBkWnKaCFYOpLknJk2crY6ZstvdSKuAp1EPGmPDiGucBFePV73yFbzoFTIPtk1LBbo4g==",
+      "integrity": "sha512-OM1cb+BTdVpzTJaUphj61HkMCmuos21Jlk9EIk8aiH1B+af47/0iiRmQ50tSynC52Z+c8GUkNKK+ofr5bUl3qg==",
       "dev": true,
       "requires": {
         "@balena/node-beaglebone-usbboot": "^3.0.0",

package.json

@@ -2,7 +2,7 @@
   "name": "balena-etcher",
   "private": true,
   "displayName": "balenaEtcher",
-  "version": "1.18.3",
+  "version": "1.18.6",
   "packageType": "local",
   "main": "generated/etcher.js",
   "description": "Flash OS images to SD cards and USB drives, safely and easily.",
@@ -14,7 +14,7 @@
   },
   "scripts": {
     "build": "npm run webpack",
-    "flowzone-preinstall-linux": "sudo apt-get install -y xvfb libudev-dev && cat < electron-builder.yml | yq e .deb.depends[] - | xargs -L1 echo | sed 's/|//g' | xargs -L1 sudo apt-get --ignore-missing install || true",
+    "flowzone-preinstall-linux": "sudo apt-get update && sudo apt-get install -y xvfb libudev-dev && cat < electron-builder.yml | yq e .deb.depends[] - | xargs -L1 echo | sed 's/|//g' | xargs -L1 sudo apt-get --ignore-missing install || true",
     "flowzone-preinstall-macos": "true",
     "flowzone-preinstall-windows": "npx node-gyp install",
     "flowzone-preinstall": "npm run flowzone-preinstall-linux",
@@ -51,6 +51,7 @@
   "devDependencies": {
     "@balena/lint": "5.4.2",
     "@balena/sudo-prompt": "9.2.1-workaround-windows-amperstand-in-username-0849e215b947987a643fe5763902aea201255534",
+    "@electron/fuses": "^1.6.1",
     "@electron/remote": "^2.0.9",
     "@fortawesome/fontawesome-free": "5.15.4",
     "@sentry/electron": "^4.1.2",
@@ -83,7 +84,7 @@
     "electron-rebuild": "^3.2.9",
     "electron-updater": "5.3.0",
     "esbuild-loader": "2.20.0",
-    "etcher-sdk": "^8.3.0",
+    "etcher-sdk": "8.3.1",
     "file-loader": "6.2.0",
     "husky": "4.3.8",
     "i18next": "21.10.0",
@@ -126,6 +127,6 @@
     "node": ">=16"
   },
   "versionist": {
-    "publishedAt": "2023-02-22T12:12:40.983Z"
+    "publishedAt": "2023-03-21T13:24:18.905Z"
   }
 }