diff --git a/.github/workflows/flowzone.yml b/.github/workflows/flowzone.yml index c8e0f3e1..06b721a5 100644 --- a/.github/workflows/flowzone.yml +++ b/.github/workflows/flowzone.yml @@ -21,6 +21,6 @@ jobs: ) secrets: inherit with: - custom_runs_on: '[["self-hosted","Linux","distro:focal","X64"],["self-hosted","Linux","distro:focal","ARM64"],["macos-12"],["windows-2019"]]' + custom_runs_on: '[["self-hosted","Linux","distro:focal","X64"],["self-hosted","Linux","distro:focal","ARM64"],["macos-12"],["windows-2019"],["macos-latest-xlarge"]]' github_prerelease: false restrict_custom_actions: false diff --git a/automation/build-bin.ts b/automation/build-bin.ts index 7df8b5ab..d5b3ba07 100644 --- a/automation/build-bin.ts +++ b/automation/build-bin.ts @@ -187,10 +187,10 @@ async function execPkg(...args: any[]) { async function buildPkg() { // https://github.com/vercel/pkg#targets let targets = `linux-${arch}`; - // TBC: not possible to build for macOS or Windows arm64 on x64 nodes if (process.platform === 'darwin') { - targets = `macos-x64`; + targets = `macos-${arch}`; } + // TBC: not yet possible to build for Windows arm64 on x64 nodes if (process.platform === 'win32') { targets = `win-x64`; } @@ -499,7 +499,7 @@ export async function buildOclifInstaller() { let packOpts = ['-r', ROOT]; if (process.platform === 'darwin') { packOS = 'macos'; - packOpts = packOpts.concat('--targets', 'darwin-x64'); + packOpts = packOpts.concat('--targets', `darwin-${arch}`); } else if (process.platform === 'win32') { packOS = 'win'; packOpts = packOpts.concat('--targets', 'win32-x64'); diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 72200bb2..7bd7b53b 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -4030,9 +4030,9 @@ } }, "node_modules/@types/node": { - "version": "20.11.25", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.25.tgz", - "integrity": "sha512-TBHyJxk2b7HceLVGFcpAUjsa5zIdsPWlR6XHfyGzd0SFu+/NFgQgMAl96MSDZgQDvJAvV6BKsFOrt6zIL09JDw==", + "version": "20.11.26", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.26.tgz", + "integrity": "sha512-YwOMmyhNnAWijOBQweOJnQPl068Oqd4K3OFbTc6AHJwzweUwwWG3GIFY74OKks2PJUDkQPeddOQES9mLn1CTEQ==", "dependencies": { "undici-types": "~5.26.4" } @@ -6098,9 +6098,9 @@ } }, "node_modules/balena-sdk/node_modules/@types/node": { - "version": "18.19.22", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.22.tgz", - "integrity": "sha512-p3pDIfuMg/aXBmhkyanPshdfJuX5c5+bQjYLIikPLXAUycEogij/c50n/C+8XOA5L93cU4ZRXtn+dNQGi0IZqQ==", + "version": "18.19.23", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.23.tgz", + "integrity": "sha512-wtE3d0OUfNKtZYAqZb8HAWGxxXsImJcPUAgZNw+dWFxO6s5tIwIjyKnY76tsTatsNCLJPkVYwUpq15D38ng9Aw==", "dependencies": { "undici-types": "~5.26.4" } @@ -28545,9 +28545,9 @@ } }, "@types/node": { - "version": "20.11.25", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.25.tgz", - "integrity": "sha512-TBHyJxk2b7HceLVGFcpAUjsa5zIdsPWlR6XHfyGzd0SFu+/NFgQgMAl96MSDZgQDvJAvV6BKsFOrt6zIL09JDw==", + "version": "20.11.26", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.26.tgz", + "integrity": "sha512-YwOMmyhNnAWijOBQweOJnQPl068Oqd4K3OFbTc6AHJwzweUwwWG3GIFY74OKks2PJUDkQPeddOQES9mLn1CTEQ==", "requires": { "undici-types": "~5.26.4" } @@ -30152,9 +30152,9 @@ }, "dependencies": { "@types/node": { - "version": "18.19.22", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.22.tgz", - "integrity": "sha512-p3pDIfuMg/aXBmhkyanPshdfJuX5c5+bQjYLIikPLXAUycEogij/c50n/C+8XOA5L93cU4ZRXtn+dNQGi0IZqQ==", + "version": "18.19.23", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.23.tgz", + "integrity": "sha512-wtE3d0OUfNKtZYAqZb8HAWGxxXsImJcPUAgZNw+dWFxO6s5tIwIjyKnY76tsTatsNCLJPkVYwUpq15D38ng9Aw==", "requires": { "undici-types": "~5.26.4" } diff --git a/tests/test-data/pkg/expected-warnings-darwin-arm64.txt b/tests/test-data/pkg/expected-warnings-darwin-arm64.txt new file mode 100644 index 00000000..e02fa3e3 --- /dev/null +++ b/tests/test-data/pkg/expected-warnings-darwin-arm64.txt @@ -0,0 +1,172 @@ +> Warning Cannot include file %1 into executable. + The file must be distributed with executable as %2. + %1: node_modules/open/xdg-open + %2: path-to-executable/xdg-open +> Warning Cannot include file %1 into executable. + The file must be distributed with executable as %2. + %1: node_modules/open/xdg-open + %2: path-to-executable/xdg-open +> Warning Cannot include file %1 into executable. + The file must be distributed with executable as %2. + %1: node_modules/etcher-sdk/node_modules/drivelist/build/Release/drivelist.node + %2: path-to-executable/drivelist.node +> Warning Cannot include file %1 into executable. + The file must be distributed with executable as %2. + %1: node_modules/etcher-sdk/node_modules/drivelist/scripts/darwin.sh + %2: path-to-executable/drivelist/darwin.sh +> Warning Cannot include file %1 into executable. + The file must be distributed with executable as %2. + %1: node_modules/etcher-sdk/node_modules/drivelist/scripts/linux.sh + %2: path-to-executable/drivelist/linux.sh +> Warning Cannot include file %1 into executable. + The file must be distributed with executable as %2. + %1: node_modules/etcher-sdk/node_modules/drivelist/scripts/win32.bat + %2: path-to-executable/drivelist/win32.bat +> Warning Cannot include file %1 into executable. + The file must be distributed with executable as %2. + %1: node_modules/etcher-sdk/node_modules/drivelist/build/Release/drivelist.node + %2: path-to-executable/drivelist.node +> Warning Cannot include file %1 into executable. + The file must be distributed with executable as %2. + %1: node_modules/etcher-sdk/node_modules/drivelist/scripts/darwin.sh + %2: path-to-executable/drivelist/darwin.sh +> Warning Cannot include file %1 into executable. + The file must be distributed with executable as %2. + %1: node_modules/etcher-sdk/node_modules/drivelist/scripts/linux.sh + %2: path-to-executable/drivelist/linux.sh +> Warning Cannot include file %1 into executable. + The file must be distributed with executable as %2. + %1: node_modules/etcher-sdk/node_modules/drivelist/scripts/win32.bat + %2: path-to-executable/drivelist/win32.bat +> Warning Cannot resolve 'path' + node_modules/@balena/compose/dist/parse/schemas/index.js + Dynamic require may fail at run time, because the requested file + is unknown at compilation time and not included into executable. + Use a string literal as an argument for 'require', or leave it + as is and specify the resolved file name in 'scripts' option. +> Warning Cannot include file %1 into executable. + The file must be distributed with executable as %2. + %1: node_modules/drivelist/build/Release/drivelist.node + %2: path-to-executable/drivelist.node +> Warning Cannot include file %1 into executable. + The file must be distributed with executable as %2. + %1: node_modules/drivelist/scripts/darwin.sh + %2: path-to-executable/drivelist/darwin.sh +> Warning Cannot include file %1 into executable. + The file must be distributed with executable as %2. + %1: node_modules/drivelist/scripts/linux.sh + %2: path-to-executable/drivelist/linux.sh +> Warning Cannot include file %1 into executable. + The file must be distributed with executable as %2. + %1: node_modules/drivelist/scripts/win32.bat + %2: path-to-executable/drivelist/win32.bat +> Warning Cannot include file %1 into executable. + The file must be distributed with executable as %2. + %1: node_modules/drivelist/build/Release/drivelist.node + %2: path-to-executable/drivelist.node +> Warning Cannot include file %1 into executable. + The file must be distributed with executable as %2. + %1: node_modules/drivelist/scripts/darwin.sh + %2: path-to-executable/drivelist/darwin.sh +> Warning Cannot include file %1 into executable. + The file must be distributed with executable as %2. + %1: node_modules/drivelist/scripts/linux.sh + %2: path-to-executable/drivelist/linux.sh +> Warning Cannot include file %1 into executable. + The file must be distributed with executable as %2. + %1: node_modules/drivelist/scripts/win32.bat + %2: path-to-executable/drivelist/win32.bat +> Warning Cannot include file %1 into executable. + The file must be distributed with executable as %2. + %1: node_modules/resin-cli-visuals/node_modules/drivelist/build/Release/drivelist.node + %2: path-to-executable/drivelist.node +> Warning Cannot include file %1 into executable. + The file must be distributed with executable as %2. + %1: node_modules/resin-cli-visuals/node_modules/drivelist/scripts/darwin.sh + %2: path-to-executable/drivelist/darwin.sh +> Warning Cannot include file %1 into executable. + The file must be distributed with executable as %2. + %1: node_modules/resin-cli-visuals/node_modules/drivelist/scripts/linux.sh + %2: path-to-executable/drivelist/linux.sh +> Warning Cannot include file %1 into executable. + The file must be distributed with executable as %2. + %1: node_modules/resin-cli-visuals/node_modules/drivelist/scripts/win32.bat + %2: path-to-executable/drivelist/win32.bat +> Warning Cannot include file %1 into executable. + The file must be distributed with executable as %2. + %1: node_modules/resin-cli-visuals/node_modules/drivelist/build/Release/drivelist.node + %2: path-to-executable/drivelist.node +> Warning Cannot include file %1 into executable. + The file must be distributed with executable as %2. + %1: node_modules/resin-cli-visuals/node_modules/drivelist/scripts/darwin.sh + %2: path-to-executable/drivelist/darwin.sh +> Warning Cannot include file %1 into executable. + The file must be distributed with executable as %2. + %1: node_modules/resin-cli-visuals/node_modules/drivelist/scripts/linux.sh + %2: path-to-executable/drivelist/linux.sh +> Warning Cannot include file %1 into executable. + The file must be distributed with executable as %2. + %1: node_modules/resin-cli-visuals/node_modules/drivelist/scripts/win32.bat + %2: path-to-executable/drivelist/win32.bat +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/index.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/axios.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/utils.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/adapters/adapters.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/adapters/http.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/adapters/xhr.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/cancel/CancelToken.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/cancel/CanceledError.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/cancel/isCancel.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/core/Axios.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/core/AxiosError.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/core/AxiosHeaders.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/core/InterceptorManager.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/core/buildFullPath.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/core/dispatchRequest.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/core/mergeConfig.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/core/settle.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/core/transformData.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/defaults/index.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/defaults/transitional.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/env/data.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/helpers/AxiosTransformStream.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/helpers/AxiosURLSearchParams.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/helpers/HttpStatusCode.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/helpers/ZlibHeaderTransformStream.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/helpers/bind.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/helpers/buildURL.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/helpers/callbackify.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/helpers/combineURLs.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/helpers/cookies.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/helpers/formDataToJSON.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/helpers/formDataToStream.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/helpers/fromDataURI.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/helpers/isAbsoluteURL.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/helpers/isAxiosError.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/helpers/isURLSameOrigin.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/helpers/parseHeaders.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/helpers/parseProtocol.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/helpers/readBlob.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/helpers/speedometer.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/helpers/spread.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/helpers/throttle.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/helpers/toFormData.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/helpers/toURLEncodedForm.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/helpers/validator.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/platform/index.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/platform/common/utils.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/platform/node/index.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/platform/node/classes/FormData.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/platform/node/classes/URLSearchParams.js +prebuild-install warn install No prebuilt binaries found (target=v20.10.0 runtime=node arch=arm64 libc= platform=darwin) +prebuild-install warn install No prebuilt binaries found (target=v20.10.0 runtime=node arch=arm64 libc= platform=darwin) +prebuild-install warn install No prebuilt binaries found (target=v20.10.0 runtime=node arch=arm64 libc= platform=darwin) +prebuild-install warn install No prebuilt binaries found (target=v20.10.0 runtime=node arch=arm64 libc= platform=darwin) +> Warning Failed to make bytecode node20-arm64 for file node_modules/@isaacs/cliui/node_modules/string-width/index.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/@isaacs/cliui/node_modules/strip-ansi/index.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/@isaacs/cliui/node_modules/wrap-ansi/index.js +prebuild-install warn install No prebuilt binaries found (target=v20.10.0 runtime=node arch=arm64 libc= platform=darwin) +> Warning Failed to make bytecode node20-arm64 for file node_modules/@isaacs/cliui/node_modules/ansi-regex/index.js +> Warning Failed to make bytecode node20-arm64 for file node_modules/@isaacs/cliui/node_modules/ansi-styles/index.js +prebuild-install warn install No prebuilt binaries found (target=v20.10.0 runtime=node arch=arm64 libc= platform=darwin) +prebuild-install warn install No prebuilt binaries found (target=v20.10.0 runtime=node arch=arm64 libc= platform=darwin) \ No newline at end of file