From 19df114a099cefa1595db7c7531967c5006ce438 Mon Sep 17 00:00:00 2001 From: ab77 Date: Thu, 5 Jan 2023 10:18:11 -0800 Subject: [PATCH] remove win-arm64 experiments --- .github/actions/publish/action.yml | 25 +-- .github/actions/test/action.yml | 5 +- package-lock.json | 166 ++++++++++++------ package.json | 11 +- patches/lzma-native+8.0.6.patch | 47 ----- ...re-all-file-extensions-in-gitattributes.sh | 2 +- scripts/ci/postinstall.sh | 12 -- scripts/ci/preinstall.sh | 9 - 8 files changed, 125 insertions(+), 152 deletions(-) delete mode 100644 patches/lzma-native+8.0.6.patch delete mode 100755 scripts/ci/preinstall.sh diff --git a/.github/actions/publish/action.yml b/.github/actions/publish/action.yml index 1095ea66dd..f4e7788798 100644 --- a/.github/actions/publish/action.yml +++ b/.github/actions/publish/action.yml @@ -15,10 +15,10 @@ inputs: default: "accounts+apple@balena.io" NODE_VERSION: type: string - default: "16.19.0" + default: "16.x" VERBOSE: type: string - default: "true" + default: "false" runs: # https://docs.github.com/en/actions/creating-actions/creating-a-composite-action @@ -91,8 +91,6 @@ runs: run: | set -ea - [[ '${{ inputs.VERBOSE }}' =~ on|On|Yes|yes|true|True ]] && set -x - branch="$(echo '${{ github.event.pull_request.head.ref }}' | sed 's/[^[:alnum:]]/-/g')" stdout="$(resinci-deploy store sentry \ @@ -102,6 +100,7 @@ runs: --org="$(yq e '.sentry.org' repo.yml)" \ --type="$(yq e '.sentry.type' repo.yml)")" + echo "::add-mask::${stdout}" echo "dsn=$(echo "${stdout}" | tail -n 1)" >> $GITHUB_OUTPUT env: @@ -180,22 +179,13 @@ runs: for arch in ${archs[*]}; do # (re)build|pack for all non-x64 architectures if ! [[ "$arch" =~ x64 ]]; then - # FIXME: remove when Node.js win-arm64 support ships - # https://github.com/nodejs/build/issues/2450#issuecomment-1367786829 - if [[ "$runner_os" =~ win ]] && [[ "$arch" =~ arm64 ]]; then - find "$(dirname $(which node))/.." -type f -name node-gyp.js \ - | xargs -I{} node {} install \ - --dist-url=https://unofficial-builds.nodejs.org/download/release - fi - npm ci - - find node_modules -type d \( -name 'prebuilds' -o -name 'deps' \) \ - | xargs -L1 -I{} find {} -type f - npm run build fi + find node_modules -type d \( -name 'prebuilds' -o -name 'deps' \) \ + | xargs -L1 -I{} find {} -type f + electron-builder "--${ELECTRON_BUILDER_OS}" "${target}" "--${arch}" \ --c.extraMetadata.analytics.sentry.token='${{ steps.sentry.outputs.dsn }}' \ --c.extraMetadata.analytics.mixpanel.token='balena-etcher' \ @@ -214,9 +204,6 @@ runs: # https://github.blog/2020-08-03-github-actions-improvements-for-fork-and-pull-request-workflows/#improvements-for-public-repository-forks # https://docs.github.com/en/actions/managing-workflow-runs/approving-workflow-runs-from-public-forks#about-workflow-runs-from-public-forks CSC_FOR_PULL_REQUEST: true - # https://www.electron.build/#debug - DEBUG: electron-builder - NPM_CONFIG_loglevel: verbose # https://www.electron.build/auto-update.html#staged-rollouts - name: Configure staged rollout(s) diff --git a/.github/actions/test/action.yml b/.github/actions/test/action.yml index 6b4657e06a..e7210b8d4e 100644 --- a/.github/actions/test/action.yml +++ b/.github/actions/test/action.yml @@ -12,10 +12,10 @@ inputs: # --- custom environment NODE_VERSION: type: string - default: "16.19.0" + default: "16.x" VERBOSE: type: string - default: "true" + default: "false" runs: # https://docs.github.com/en/actions/creating-actions/creating-a-composite-action @@ -54,7 +54,6 @@ runs: env: # https://www.electronjs.org/docs/latest/api/environment-variables ELECTRON_NO_ATTACH_CONSOLE: true - NPM_CONFIG_loglevel: verbose - name: Compress custom source shell: pwsh diff --git a/package-lock.json b/package-lock.json index 50dfa3f168..dcda410fcf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -41,7 +41,7 @@ "electron-rebuild": "3.2.9", "electron-updater": "5.3.0", "esbuild-loader": "2.20.0", - "etcher-sdk": "7.4.7-build-ab77-operational-6f10344d887bcf306b3bf897a5451666f6590ae9-1", + "etcher-sdk": "7.5.0-build-ab77-operational-b6b28fa83d619c5c1b4fa07f0ee9dc5702bec6ea-1", "file-loader": "6.2.0", "husky": "4.3.8", "i18next": "21.10.0", @@ -5178,11 +5178,12 @@ "license": "MIT" }, "node_modules/balena-image-fs": { - "version": "7.1.2-build-ab77-operational-072f44e6336a19e0f102ff0d8cbfe9edb65aad2d-1", + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/balena-image-fs/-/balena-image-fs-7.1.2.tgz", + "integrity": "sha512-f/RDGO/l4UdfHKoJb0BkBu9uPBG2OBuv7iK5z37ygIyBpFNCO+JdQcHjI4pM0kq6qHe98a/jNdBDMajJBhxMvQ==", "dev": true, - "license": "Apache-2.0", "dependencies": { - "ext2fs": "4.1.7-build-ab77-operational-ebb275b0f548905a5ab9f53b9b5363e060b857f4-1", + "ext2fs": "4.1.7", "fatfs": "^0.10.8", "file-disk": "^8.0.1", "partitioninfo": "^6.0.3", @@ -6031,8 +6032,9 @@ }, "node_modules/chs": { "version": "1.1.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/chs/-/chs-1.1.0.tgz", + "integrity": "sha512-XPNir/V/SuHCyqz8+PRyq8OkNacS1RCSVBC+uEcFFZ5V4ZVtgQtpkEHx0kJYwiicaSFaIdka3HrVoYL7NHVR/w==", + "dev": true }, "node_modules/ci-info": { "version": "2.0.0", @@ -7772,10 +7774,11 @@ "license": "BSD-2-Clause" }, "node_modules/drivelist": { - "version": "11.0.5-build-ab77-operational-fdab0995f1e85b3d5abde0ff8d835c0a17341866-1", + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/drivelist/-/drivelist-11.1.0.tgz", + "integrity": "sha512-DT328SbKqB78y+HUeuazwj4+Enh5ormv9OgTIMB0/OP2VxKLFDOrKhejJxjP9ytmJok8W/nzR8gSWdpiaJi1XA==", "dev": true, "hasInstallScript": true, - "license": "Apache-2.0", "dependencies": { "bindings": "^1.5.0", "debug": "^4.3.4", @@ -9195,22 +9198,23 @@ } }, "node_modules/etcher-sdk": { - "version": "7.4.7-build-ab77-operational-6f10344d887bcf306b3bf897a5451666f6590ae9-1", - "resolved": "https://registry.npmjs.org/etcher-sdk/-/etcher-sdk-7.4.7-build-ab77-operational-6f10344d887bcf306b3bf897a5451666f6590ae9-1.tgz", - "integrity": "sha512-CEx7ghCvOpyPIHYJgVqZnR7ne+hE2q7YlB0Nz2Grmsk9f1hCfEGzCJXZSAgbiFtC80/zMnrXVoog510x2hEOyQ==", + "version": "7.5.0-build-ab77-operational-b6b28fa83d619c5c1b4fa07f0ee9dc5702bec6ea-1", + "resolved": "https://registry.npmjs.org/etcher-sdk/-/etcher-sdk-7.5.0-build-ab77-operational-b6b28fa83d619c5c1b4fa07f0ee9dc5702bec6ea-1.tgz", + "integrity": "sha512-LXiHvs6Y6P0JQtZWmaMPHI3v9jVvzQpcl/+5889JNs7Nk/2U4xTh+T2bcpZQrPw3SiS+FE53PFG/MOnzTAKF4g==", "dev": true, + "hasInstallScript": true, "dependencies": { "@balena/node-beaglebone-usbboot": "^2.0.1", "@balena/udif": "^1.1.2", "@ronomon/direct-io": "^3.0.1", "aws4-axios": "^2.4.6", "axios": "^0.27.2", - "balena-image-fs": "7.1.2-build-ab77-operational-072f44e6336a19e0f102ff0d8cbfe9edb65aad2d-1", + "balena-image-fs": "7.1.2", "blockmap": "^4.0.3", "check-disk-space": "^2.1.0", "cyclic-32": "^1.1.0", "debug": "^3.1.0", - "drivelist": "11.0.5-build-ab77-operational-fdab0995f1e85b3d5abde0ff8d835c0a17341866-1", + "drivelist": "11.1.0", "file-disk": "^8.0.1", "file-type": "^16.5.4", "gzip-stream": "^1.1.2", @@ -9221,7 +9225,7 @@ "partitioninfo": "^6.0.2", "rwmutex": "^1.0.0", "tslib": "^2.0.0", - "unbzip2-stream": "github:balena-io-modules/unbzip2-stream#4a54f56", + "unbzip2-stream": "1.4.2", "unzip-stream": "^0.3.0", "xxhash-addon": "^1.4.0", "yauzl": "^2.9.2", @@ -9231,7 +9235,7 @@ "node": "16" }, "optionalDependencies": { - "winusb-driver-generator": "1.2.8-build-ab77-operational-dbcb306dc547667326270cafcb5d4447babd56b3-1" + "winusb-driver-generator": "1.4.0" } }, "node_modules/etcher-sdk/node_modules/aws4-axios": { @@ -9326,8 +9330,9 @@ }, "node_modules/expand-template": { "version": "2.0.3", + "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz", + "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==", "dev": true, - "license": "(MIT OR WTFPL)", "engines": { "node": ">=6" } @@ -9445,9 +9450,10 @@ "license": "ISC" }, "node_modules/ext2fs": { - "version": "4.1.7-build-ab77-operational-ebb275b0f548905a5ab9f53b9b5363e060b857f4-1", + "version": "4.1.7", + "resolved": "https://registry.npmjs.org/ext2fs/-/ext2fs-4.1.7.tgz", + "integrity": "sha512-saAfJb2G02DtCTiAWgtYcc9+D85z1vlEFLvuDolpBOJaK+X1Rr8VvvtBbhr4Vai3bdfIjpiBVl5BIKSdaL8ihA==", "dev": true, - "license": "Apache-2.0", "engines": { "node": "16" } @@ -9551,8 +9557,9 @@ }, "node_modules/fatfs": { "version": "0.10.8", + "resolved": "https://registry.npmjs.org/fatfs/-/fatfs-0.10.8.tgz", + "integrity": "sha512-SgtbqGNMwptNXpgLeqSSShm254JIzoVUyyFQBbqMmSPDpKsdZ65vSiS2SzyUI8sMtPvYK62hkuYhXzGZCMt5uQ==", "dev": true, - "license": "Apache-2.0", "dependencies": { "fifolock": "^1.0.0", "struct-fu": "^1.2.1", @@ -9607,8 +9614,9 @@ }, "node_modules/fifolock": { "version": "1.0.0", - "dev": true, - "license": "BSD-2-Clause" + "resolved": "https://registry.npmjs.org/fifolock/-/fifolock-1.0.0.tgz", + "integrity": "sha512-CqipzmuW6+xm7emSaBx1rV/fX17UGF9HkzLH887cFOj/Pe3TJsrboGxjZZtzV/5JrQ5vMegQ7ipZkB9wvsBDDQ==", + "dev": true }, "node_modules/figures": { "version": "2.0.0", @@ -9623,8 +9631,9 @@ }, "node_modules/file-disk": { "version": "8.0.1", + "resolved": "https://registry.npmjs.org/file-disk/-/file-disk-8.0.1.tgz", + "integrity": "sha512-oO1bkG2RmZnMqteiAO3Uhffj/f6PJ5WY3fdVJJuI5tDbDgW3MgQvhQsDpijX81TXCbxRAKaNFdEQABTTyjL+og==", "dev": true, - "license": "Apache-2.0", "dependencies": { "tslib": "^2.0.0" } @@ -10183,8 +10192,9 @@ }, "node_modules/gpt": { "version": "2.0.4", + "resolved": "https://registry.npmjs.org/gpt/-/gpt-2.0.4.tgz", + "integrity": "sha512-gCibB52dZAjDeyuAJE158FfVYpMa8poCBMYvNXCwDvZJ0+5D0YpP1hZ/KYtWpQyXu18ddoQoqj+FGnbyq2qhKw==", "dev": true, - "license": "MIT", "dependencies": { "cyclic-32": "^1.1.0" } @@ -12513,8 +12523,9 @@ }, "node_modules/mbr": { "version": "1.1.3", + "resolved": "https://registry.npmjs.org/mbr/-/mbr-1.1.3.tgz", + "integrity": "sha512-be9zNj5gJOTAppUkjU7HU/hZnjLRsfkKSnlle1BqxmTzMlGis7dbIClEbQnDKlUjNaFhBTcQQ/KQT+OQDWAvJg==", "dev": true, - "license": "MIT", "dependencies": { "bloodline": "^1.0.1", "chs": "^1.1.0" @@ -13839,8 +13850,9 @@ }, "node_modules/napi-build-utils": { "version": "1.0.2", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz", + "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==", + "dev": true }, "node_modules/native-addon-loader": { "version": "2.0.1", @@ -14650,8 +14662,9 @@ }, "node_modules/partitioninfo": { "version": "6.0.3", + "resolved": "https://registry.npmjs.org/partitioninfo/-/partitioninfo-6.0.3.tgz", + "integrity": "sha512-4B88aRAwZm/KYT9dxvdTbrqZ24AiUOnVfkuKVqjQWO3tNvnD2o8g6afZzQnd6+JUuCZWzMq7JrfxtfbL8EyPNQ==", "dev": true, - "license": "MIT", "dependencies": { "file-disk": "^8.0.1", "gpt": "^2.0.4", @@ -15183,8 +15196,9 @@ }, "node_modules/prebuild-install": { "version": "7.1.1", + "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz", + "integrity": "sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==", "dev": true, - "license": "MIT", "dependencies": { "detect-libc": "^2.0.0", "expand-template": "^2.0.3", @@ -17143,6 +17157,8 @@ }, "node_modules/simple-get": { "version": "4.0.1", + "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz", + "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==", "dev": true, "funding": [ { @@ -17158,7 +17174,6 @@ "url": "https://feross.org/support" } ], - "license": "MIT", "dependencies": { "decompress-response": "^6.0.0", "once": "^1.3.1", @@ -17167,8 +17182,9 @@ }, "node_modules/simple-get/node_modules/decompress-response": { "version": "6.0.0", + "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", + "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", "dev": true, - "license": "MIT", "dependencies": { "mimic-response": "^3.1.0" }, @@ -17181,8 +17197,9 @@ }, "node_modules/simple-get/node_modules/mimic-response": { "version": "3.1.0", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", + "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=10" }, @@ -17971,8 +17988,9 @@ }, "node_modules/struct-fu": { "version": "1.2.1", - "dev": true, - "license": "BSD-2-Clause" + "resolved": "https://registry.npmjs.org/struct-fu/-/struct-fu-1.2.1.tgz", + "integrity": "sha512-QrtfoBRe+RixlBJl852/Gu7tLLTdx3kWs3MFzY1OHNrSsYYK7aIAnzqsncYRWrKGG/QSItDmOTlELMxehw4Gjw==", + "dev": true }, "node_modules/style-loader": { "version": "2.0.0", @@ -18777,8 +18795,9 @@ }, "node_modules/typed-error": { "version": "3.2.1", + "resolved": "https://registry.npmjs.org/typed-error/-/typed-error-3.2.1.tgz", + "integrity": "sha512-XlUv4JMrT2dpN0c4Vm3lOm88ga21Z6pNJUmjejRz/mkh6sdBtkMwyRf4fF+yhRGZgfgWam31Lkxu11GINKiBTQ==", "dev": true, - "license": "Apache-2.0", "engines": { "node": ">=6.0.0", "npm": ">=3.0.0" @@ -20097,9 +20116,9 @@ "license": "MIT" }, "node_modules/winusb-driver-generator": { - "version": "1.2.8-build-ab77-operational-dbcb306dc547667326270cafcb5d4447babd56b3-1", - "resolved": "https://registry.npmjs.org/winusb-driver-generator/-/winusb-driver-generator-1.2.8-build-ab77-operational-dbcb306dc547667326270cafcb5d4447babd56b3-1.tgz", - "integrity": "sha512-izB8ob3lAxil9F3FTPWZvZP4E7kQyU+OnRKB0nCtgrRf1fVYMf9BaZCaS3/h88f/VTRkDjiQKzklmC/UqVrhbg==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/winusb-driver-generator/-/winusb-driver-generator-1.4.0.tgz", + "integrity": "sha512-t3+ELcX2mcPcgtkeGGHmRFM8EiE2RE2DUnj3i/ISlEdiWHdrh10n3tGQ7fIk5IR72ChZsVQ7I/NhdTCJMlOqFw==", "dev": true, "hasInstallScript": true, "optional": true, @@ -20228,8 +20247,9 @@ }, "node_modules/xok": { "version": "1.0.0", - "dev": true, - "license": "WTFPL" + "resolved": "https://registry.npmjs.org/xok/-/xok-1.0.0.tgz", + "integrity": "sha512-DVb6F65Oiq0/fQxLH4adxE92OeNl1njEd+A1pPknmujM/nJhid2iofGXhrU4subNbUi2F0whuKhLv8ReFsqg6g==", + "dev": true }, "node_modules/xtend": { "version": "4.0.2", @@ -23911,10 +23931,12 @@ "dev": true }, "balena-image-fs": { - "version": "7.1.2-build-ab77-operational-072f44e6336a19e0f102ff0d8cbfe9edb65aad2d-1", + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/balena-image-fs/-/balena-image-fs-7.1.2.tgz", + "integrity": "sha512-f/RDGO/l4UdfHKoJb0BkBu9uPBG2OBuv7iK5z37ygIyBpFNCO+JdQcHjI4pM0kq6qHe98a/jNdBDMajJBhxMvQ==", "dev": true, "requires": { - "ext2fs": "4.1.7-build-ab77-operational-ebb275b0f548905a5ab9f53b9b5363e060b857f4-1", + "ext2fs": "4.1.7", "fatfs": "^0.10.8", "file-disk": "^8.0.1", "partitioninfo": "^6.0.3", @@ -24467,6 +24489,8 @@ }, "chs": { "version": "1.1.0", + "resolved": "https://registry.npmjs.org/chs/-/chs-1.1.0.tgz", + "integrity": "sha512-XPNir/V/SuHCyqz8+PRyq8OkNacS1RCSVBC+uEcFFZ5V4ZVtgQtpkEHx0kJYwiicaSFaIdka3HrVoYL7NHVR/w==", "dev": true }, "ci-info": { @@ -25694,7 +25718,9 @@ "dev": true }, "drivelist": { - "version": "11.0.5-build-ab77-operational-fdab0995f1e85b3d5abde0ff8d835c0a17341866-1", + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/drivelist/-/drivelist-11.1.0.tgz", + "integrity": "sha512-DT328SbKqB78y+HUeuazwj4+Enh5ormv9OgTIMB0/OP2VxKLFDOrKhejJxjP9ytmJok8W/nzR8gSWdpiaJi1XA==", "dev": true, "requires": { "bindings": "^1.5.0", @@ -26639,9 +26665,9 @@ "dev": true }, "etcher-sdk": { - "version": "7.4.7-build-ab77-operational-6f10344d887bcf306b3bf897a5451666f6590ae9-1", - "resolved": "https://registry.npmjs.org/etcher-sdk/-/etcher-sdk-7.4.7-build-ab77-operational-6f10344d887bcf306b3bf897a5451666f6590ae9-1.tgz", - "integrity": "sha512-CEx7ghCvOpyPIHYJgVqZnR7ne+hE2q7YlB0Nz2Grmsk9f1hCfEGzCJXZSAgbiFtC80/zMnrXVoog510x2hEOyQ==", + "version": "7.5.0-build-ab77-operational-b6b28fa83d619c5c1b4fa07f0ee9dc5702bec6ea-1", + "resolved": "https://registry.npmjs.org/etcher-sdk/-/etcher-sdk-7.5.0-build-ab77-operational-b6b28fa83d619c5c1b4fa07f0ee9dc5702bec6ea-1.tgz", + "integrity": "sha512-LXiHvs6Y6P0JQtZWmaMPHI3v9jVvzQpcl/+5889JNs7Nk/2U4xTh+T2bcpZQrPw3SiS+FE53PFG/MOnzTAKF4g==", "dev": true, "requires": { "@balena/node-beaglebone-usbboot": "^2.0.1", @@ -26649,12 +26675,12 @@ "@ronomon/direct-io": "^3.0.1", "aws4-axios": "^2.4.6", "axios": "^0.27.2", - "balena-image-fs": "7.1.2-build-ab77-operational-072f44e6336a19e0f102ff0d8cbfe9edb65aad2d-1", + "balena-image-fs": "7.1.2", "blockmap": "^4.0.3", "check-disk-space": "^2.1.0", "cyclic-32": "^1.1.0", "debug": "^3.1.0", - "drivelist": "11.0.5-build-ab77-operational-fdab0995f1e85b3d5abde0ff8d835c0a17341866-1", + "drivelist": "11.1.0", "file-disk": "^8.0.1", "file-type": "^16.5.4", "gzip-stream": "^1.1.2", @@ -26665,9 +26691,9 @@ "partitioninfo": "^6.0.2", "rwmutex": "^1.0.0", "tslib": "^2.0.0", - "unbzip2-stream": "github:balena-io-modules/unbzip2-stream#4a54f56", + "unbzip2-stream": "1.4.2", "unzip-stream": "^0.3.0", - "winusb-driver-generator": "1.2.8-build-ab77-operational-dbcb306dc547667326270cafcb5d4447babd56b3-1", + "winusb-driver-generator": "1.4.0", "xxhash-addon": "^1.4.0", "yauzl": "^2.9.2", "zip-part-stream": "^1.0.3" @@ -26737,6 +26763,8 @@ }, "expand-template": { "version": "2.0.3", + "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz", + "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==", "dev": true }, "express": { @@ -26823,7 +26851,9 @@ } }, "ext2fs": { - "version": "4.1.7-build-ab77-operational-ebb275b0f548905a5ab9f53b9b5363e060b857f4-1", + "version": "4.1.7", + "resolved": "https://registry.npmjs.org/ext2fs/-/ext2fs-4.1.7.tgz", + "integrity": "sha512-saAfJb2G02DtCTiAWgtYcc9+D85z1vlEFLvuDolpBOJaK+X1Rr8VvvtBbhr4Vai3bdfIjpiBVl5BIKSdaL8ihA==", "dev": true }, "extend": { @@ -26897,6 +26927,8 @@ }, "fatfs": { "version": "0.10.8", + "resolved": "https://registry.npmjs.org/fatfs/-/fatfs-0.10.8.tgz", + "integrity": "sha512-SgtbqGNMwptNXpgLeqSSShm254JIzoVUyyFQBbqMmSPDpKsdZ65vSiS2SzyUI8sMtPvYK62hkuYhXzGZCMt5uQ==", "dev": true, "requires": { "fifolock": "^1.0.0", @@ -26946,6 +26978,8 @@ }, "fifolock": { "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fifolock/-/fifolock-1.0.0.tgz", + "integrity": "sha512-CqipzmuW6+xm7emSaBx1rV/fX17UGF9HkzLH887cFOj/Pe3TJsrboGxjZZtzV/5JrQ5vMegQ7ipZkB9wvsBDDQ==", "dev": true }, "figures": { @@ -26957,6 +26991,8 @@ }, "file-disk": { "version": "8.0.1", + "resolved": "https://registry.npmjs.org/file-disk/-/file-disk-8.0.1.tgz", + "integrity": "sha512-oO1bkG2RmZnMqteiAO3Uhffj/f6PJ5WY3fdVJJuI5tDbDgW3MgQvhQsDpijX81TXCbxRAKaNFdEQABTTyjL+og==", "dev": true, "requires": { "tslib": "^2.0.0" @@ -27322,6 +27358,8 @@ }, "gpt": { "version": "2.0.4", + "resolved": "https://registry.npmjs.org/gpt/-/gpt-2.0.4.tgz", + "integrity": "sha512-gCibB52dZAjDeyuAJE158FfVYpMa8poCBMYvNXCwDvZJ0+5D0YpP1hZ/KYtWpQyXu18ddoQoqj+FGnbyq2qhKw==", "dev": true, "requires": { "cyclic-32": "^1.1.0" @@ -28760,6 +28798,8 @@ }, "mbr": { "version": "1.1.3", + "resolved": "https://registry.npmjs.org/mbr/-/mbr-1.1.3.tgz", + "integrity": "sha512-be9zNj5gJOTAppUkjU7HU/hZnjLRsfkKSnlle1BqxmTzMlGis7dbIClEbQnDKlUjNaFhBTcQQ/KQT+OQDWAvJg==", "dev": true, "requires": { "bloodline": "^1.0.1", @@ -29655,6 +29695,8 @@ }, "napi-build-utils": { "version": "1.0.2", + "resolved": "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz", + "integrity": "sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==", "dev": true }, "native-addon-loader": { @@ -30184,6 +30226,8 @@ }, "partitioninfo": { "version": "6.0.3", + "resolved": "https://registry.npmjs.org/partitioninfo/-/partitioninfo-6.0.3.tgz", + "integrity": "sha512-4B88aRAwZm/KYT9dxvdTbrqZ24AiUOnVfkuKVqjQWO3tNvnD2o8g6afZzQnd6+JUuCZWzMq7JrfxtfbL8EyPNQ==", "dev": true, "requires": { "file-disk": "^8.0.1", @@ -30538,6 +30582,8 @@ }, "prebuild-install": { "version": "7.1.1", + "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz", + "integrity": "sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==", "dev": true, "requires": { "detect-libc": "^2.0.0", @@ -31876,6 +31922,8 @@ }, "simple-get": { "version": "4.0.1", + "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz", + "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==", "dev": true, "requires": { "decompress-response": "^6.0.0", @@ -31885,6 +31933,8 @@ "dependencies": { "decompress-response": { "version": "6.0.0", + "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", + "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", "dev": true, "requires": { "mimic-response": "^3.1.0" @@ -31892,6 +31942,8 @@ }, "mimic-response": { "version": "3.1.0", + "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", + "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", "dev": true } } @@ -32399,6 +32451,8 @@ }, "struct-fu": { "version": "1.2.1", + "resolved": "https://registry.npmjs.org/struct-fu/-/struct-fu-1.2.1.tgz", + "integrity": "sha512-QrtfoBRe+RixlBJl852/Gu7tLLTdx3kWs3MFzY1OHNrSsYYK7aIAnzqsncYRWrKGG/QSItDmOTlELMxehw4Gjw==", "dev": true }, "style-loader": { @@ -32909,6 +32963,8 @@ }, "typed-error": { "version": "3.2.1", + "resolved": "https://registry.npmjs.org/typed-error/-/typed-error-3.2.1.tgz", + "integrity": "sha512-XlUv4JMrT2dpN0c4Vm3lOm88ga21Z6pNJUmjejRz/mkh6sdBtkMwyRf4fF+yhRGZgfgWam31Lkxu11GINKiBTQ==", "dev": true }, "typedarray": { @@ -32940,7 +32996,7 @@ "unbzip2-stream": { "version": "git+ssh://git@github.com/balena-io-modules/unbzip2-stream.git#4a54f56a25b58950f9e4277c56db2912d62242e7", "dev": true, - "from": "unbzip2-stream@github:balena-io-modules/unbzip2-stream#4a54f56" + "from": "unbzip2-stream@1.4.2" }, "unherit": { "version": "1.1.3", @@ -33719,9 +33775,9 @@ "dev": true }, "winusb-driver-generator": { - "version": "1.2.8-build-ab77-operational-dbcb306dc547667326270cafcb5d4447babd56b3-1", - "resolved": "https://registry.npmjs.org/winusb-driver-generator/-/winusb-driver-generator-1.2.8-build-ab77-operational-dbcb306dc547667326270cafcb5d4447babd56b3-1.tgz", - "integrity": "sha512-izB8ob3lAxil9F3FTPWZvZP4E7kQyU+OnRKB0nCtgrRf1fVYMf9BaZCaS3/h88f/VTRkDjiQKzklmC/UqVrhbg==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/winusb-driver-generator/-/winusb-driver-generator-1.4.0.tgz", + "integrity": "sha512-t3+ELcX2mcPcgtkeGGHmRFM8EiE2RE2DUnj3i/ISlEdiWHdrh10n3tGQ7fIk5IR72ChZsVQ7I/NhdTCJMlOqFw==", "dev": true, "optional": true, "requires": { @@ -33793,6 +33849,8 @@ }, "xok": { "version": "1.0.0", + "resolved": "https://registry.npmjs.org/xok/-/xok-1.0.0.tgz", + "integrity": "sha512-DVb6F65Oiq0/fQxLH4adxE92OeNl1njEd+A1pPknmujM/nJhid2iofGXhrU4subNbUi2F0whuKhLv8ReFsqg6g==", "dev": true }, "xtend": { diff --git a/package.json b/package.json index e2e88b4a1f..d8c52913d5 100644 --- a/package.json +++ b/package.json @@ -22,9 +22,8 @@ "lint-ts": "balena-lint --fix --typescript typings lib tests scripts/clean-shrinkwrap.ts webpack.config.ts", "lint": "npm run lint-ts && npm run lint-css", "postinstall": "bash scripts/ci/postinstall.sh", - "preinstall": "bash scripts/ci/preinstall.sh", "sanity-checks": "bash scripts/ci/ensure-all-file-extensions-in-gitattributes.sh", - "start": "node_modules/.bin/electron .", + "start": "npx electron .", "test-gui": "electron-mocha --recursive --reporter spec --require ts-node/register/transpile-only --require-main tests/gui/allow-renderer-process-reuse.ts --full-trace --no-sandbox --renderer tests/gui/**/*.ts", "test-linux": "npm run lint && xvfb-run --auto-servernum npm run test-gui && xvfb-run --auto-servernum npm run test-shared && xvfb-run --auto-servernum npm run test-spectron && npm run sanity-checks", "test-macos": "npm run lint && npm run test-gui && npm run test-shared && npm run test-spectron && npm run sanity-checks", @@ -82,7 +81,7 @@ "electron-rebuild": "3.2.9", "electron-updater": "5.3.0", "esbuild-loader": "2.20.0", - "etcher-sdk": "7.4.7-build-ab77-operational-6f10344d887bcf306b3bf897a5451666f6590ae9-1", + "etcher-sdk": "7.5.0-build-ab77-operational-b6b28fa83d619c5c1b4fa07f0ee9dc5702bec6ea-1", "file-loader": "6.2.0", "husky": "4.3.8", "i18next": "21.10.0", @@ -182,15 +181,13 @@ { "target": "nsis", "arch": [ - "x64", - "arm64" + "x64" ] }, { "target": "portable", "arch": [ - "x64", - "arm64" + "x64" ] } ] diff --git a/patches/lzma-native+8.0.6.patch b/patches/lzma-native+8.0.6.patch deleted file mode 100644 index d8a6f2e523..0000000000 --- a/patches/lzma-native+8.0.6.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/node_modules/lzma-native/binding.gyp b/node_modules/lzma-native/binding.gyp -index 8bcda26..3d66890 100644 ---- a/node_modules/lzma-native/binding.gyp -+++ b/node_modules/lzma-native/binding.gyp -@@ -38,8 +38,10 @@ - "conditions": [ - [ 'target_arch=="x64"', { - "library_dirs" : [ "<(module_root_dir)\\deps\\bin_x86-64" ] -- }, { -+ }, 'target_arch=="ia32"', { - "library_dirs" : [ "<(module_root_dir)\\deps\\bin_i686" ] -+ }, { -+ "library_dirs" : [ "<(module_root_dir)\\deps\\bin_ARM64" ] - } ] - ] - } -@@ -69,11 +71,16 @@ - "arch_lib_path" : 'bin_x86-64', - "arch_lib_code" : 'x64' - } -- }, { -+ }, 'target_arch=="ia32"', { - 'variables': { - "arch_lib_path" : 'bin_i686', - "arch_lib_code" : 'ix86' - } -+ },{ -+ 'variables': { -+ "arch_lib_path" : 'bin_ARM64', -+ "arch_lib_code" : 'ARM64' -+ } - } ] - ], - "actions" : [ -diff --git a/node_modules/lzma-native/package.json b/node_modules/lzma-native/package.json -index 3264e55..f18ea42 100644 ---- a/node_modules/lzma-native/package.json -+++ b/node_modules/lzma-native/package.json -@@ -37,7 +37,7 @@ - "prepack": "[ $(ls prebuilds | wc -l) = '6' ] || (echo 'Some prebuilds are missing'; exit 1)", - "test": "mocha --expose-gc -s 1000 -t 15000", - "prepare": "npm run prepare-win32 || true", -- "prepare-win32": "cd deps && 7z x -y xz-5.2.3-windows.7z bin_i686/liblzma.dll bin_x86-64/liblzma.dll include doc/liblzma.def", -+ "prepare-win32": "cd deps && 7z x -y xz-5.2.3-windows.7z bin_i686/liblzma.dll bin_x86-64/liblzma.dll bin_ARM64/liblzma.dll include doc/liblzma.def", - "jshint": "jshint ." - }, - "gypfile": true, diff --git a/scripts/ci/ensure-all-file-extensions-in-gitattributes.sh b/scripts/ci/ensure-all-file-extensions-in-gitattributes.sh index 8972c16ebe..d8aadd9660 100755 --- a/scripts/ci/ensure-all-file-extensions-in-gitattributes.sh +++ b/scripts/ci/ensure-all-file-extensions-in-gitattributes.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ### # Copyright 2017 balena.io diff --git a/scripts/ci/postinstall.sh b/scripts/ci/postinstall.sh index 44d340bc59..42b886cec3 100755 --- a/scripts/ci/postinstall.sh +++ b/scripts/ci/postinstall.sh @@ -7,18 +7,6 @@ set -ea # use specified or fallback to platform architecture arch="${arch:-$(node -e 'console.log(os.arch())')}" -# FIXME: remove when lzma-native ships with win-arm64 suport -# https://github.com/addaleax/lzma-native/issues/132 -pushd node_modules/lzma-native -# https://docs.npmjs.com/cli/v9/using-npm/config#environment-variables -NPM_CONFIG_arch="${arch}" \ - NPM_CONFIG_target_arch="${NPM_CONFIG_arch}" npm i - -# https://github.com/prebuild/prebuildify#options -# https://www.npmjs.com/package/node-gyp-build -PREBUILD_ARCH="${NPM_CONFIG_arch}" npm run prebuild -popd - # FIXME: (re)build for the latest version of electron, since v13.x uses ancient node-gyp # https://releases.electronjs.org/releases/stable electron_version="${ELECTRON_VERSION:-$(npm view electron --json | jq -r '.version')}" diff --git a/scripts/ci/preinstall.sh b/scripts/ci/preinstall.sh deleted file mode 100755 index 99e4f60043..0000000000 --- a/scripts/ci/preinstall.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -set -ea - -[[ "$VERBOSE" =~ on|On|Yes|yes|true|True ]] && set -x - -# FIXME: remove when lzma-native ships with win-arm64 suport -# https://github.com/addaleax/lzma-native/issues/132 -find patches -type f | xargs cat && npx patch-package