Merge pull request #1002 from NordicSemiconductor/feat/split-nrfutil-…

…sandboxes-m1-intel Feat/split nrfutil sandboxes m1 intel
NordicSemiconductor · Apr 23, 2024 · 08e9c9f · 08e9c9f
2 parents f0d73d7 + 284394e
commit 08e9c9f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/build/bundleApps.js b/build/bundleApps.js
@@ -28,6 +28,11 @@ const bundleNrfutilModule = (module, version) => {
     preparingSandbox.get(module).add(version);
 
     console.log(`Bundling nrfutil module ${module} version ${version}`);
+
+    const nrfutilSandboxFolder =
+        process.platform === 'darwin' && process.arch !== 'x64'
+            ? path.join('nrfutil-sandboxes', process.arch)
+            : 'nrfutil-sandboxes';
     execSync(
         `${path.join(
             'resources',
@@ -38,7 +43,7 @@ const bundleNrfutilModule = (module, version) => {
                 ...process.env,
                 NRFUTIL_HOME: path.join(
                     'resources',
-                    'nrfutil-sandboxes',
+                    nrfutilSandboxFolder,
                     module,
                     version
                 ),

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -92,7 +92,7 @@
     },
     "devDependencies": {
         "@electron/notarize": "^2.2.0",
-        "@nordicsemiconductor/pc-nrfconnect-shared": "^166.0.0",
+        "@nordicsemiconductor/pc-nrfconnect-shared": "^173.0.0",
         "@playwright/test": "^1.16.3",
         "@testing-library/user-event": "^14.4.3",
         "@types/chmodr": "1.0.0",