No need for WoA-specific scripts.

All we needed in the end was to use the arm64 version of Node.js!

Author: agarny

.github/workflows/cd.yml

@@ -19,15 +19,12 @@ jobs:
           - name: Windows (ARM)
             os: windows-2019
             node_architecture: arm64
-            install_suffix: ':arm'
-            package_suffix: ':arm'
           - name: Linux (Intel)
             os: ubuntu-22.04
             node_architecture: x64
           - name: Linux (ARM)
             os: ubuntu-22.04-arm
             node_architecture: arm64
-            install_suffix: ':arm'
           - name: macOS (Intel)
             os: macos-13
             node_architecture: x64
@@ -79,9 +76,9 @@ jobs:
           sudo apt update
           sudo apt install libopenjp2-tools
       - name: OpenCOR dependencies
-        run: pnpm install${{ matrix.install_suffix }}
+        run: pnpm install
       - name: Package OpenCOR
-        run: pnpm package${{ matrix.package_suffix }}
+        run: pnpm package
       - name: Remove blockmap files
         shell: bash
         run: find ./dist -name '*.blockmap' -delete

.github/workflows/ci.yml

@@ -19,15 +19,12 @@ jobs:
           - name: Windows (ARM)
             os: windows-2019
             node_architecture: arm64
-            install_suffix: ':arm'
-            build_suffix: ':arm'
           - name: Linux (Intel)
             os: ubuntu-22.04
             node_architecture: x64
           - name: Linux (ARM)
             os: ubuntu-22.04-arm
             node_architecture: arm64
-            install_suffix: ':arm'
           - name: macOS (Intel)
             os: macos-13
             node_architecture: x64
@@ -53,10 +50,10 @@ jobs:
       - name: Install pnpm
         run: npm install -g pnpm
       - name: OpenCOR dependencies
-        run: pnpm install${{ matrix.install_suffix }}
+        run: pnpm install
       - name: Build OpenCOR
         if: ${{ (matrix.name != 'Code formatting') && (matrix.name != 'Linting') }}
-        run: pnpm build${{ matrix.build_suffix }}
+        run: pnpm build
       - name: Build OpenCOR's Web app
         if: ${{ (matrix.name != 'Code formatting') && (matrix.name != 'Linting') }}
         run: pnpm build:web

README.md

@@ -32,10 +32,10 @@ To build OpenCOR, you also need a C/C++ toolchain:
 
 ## Scripts
 
-Before doing anything, you need to install all of OpenCOR's dependencies (see the [note](#note) below regarding the optional `:arm` suffix):
+Before doing anything, you need to install all of OpenCOR's dependencies:
 
 ```bash
-pnpm install[:arm]
+pnpm install
 ```
 
 Then, you can run a given script:
@@ -47,27 +47,15 @@ pnpm <script>
 where `<script>` is one of the following:
 
 - `build`: build OpenCOR;
-- `build:arm`: build OpenCOR for [Windows](https://en.wikipedia.org/wiki/Microsoft_Windows) on [ARM](https://en.wikipedia.org/wiki/ARM_architecture_family);
 - `build:libopencor`: build OpenCOR's JavaScript interface to the C++ bindings of libOpenCOR;
-- `build:libopencor:arm`: build OpenCOR's JavaScript interface to the C++ bindings of libOpenCOR for [Windows](https://en.wikipedia.org/wiki/Microsoft_Windows) on [ARM](https://en.wikipedia.org/wiki/ARM_architecture_family);
 - `build:web`: build OpenCOR's Web app;
 - `clean`: clean OpenCOR's environment;
-- `clean:all`: clean OpenCOR's environment and then prune `pnpm`'s store (the latter is needed when wanting to use both the `install` and `install:arm` scripts);
 - `dev`: start OpenCOR and OpenCOR's Web app in development mode;
-- `dev:arm`: start OpenCOR for [Windows](https://en.wikipedia.org/wiki/Microsoft_Windows) on [ARM](https://en.wikipedia.org/wiki/ARM_architecture_family) and OpenCOR's Web app in development mode;
 - `dev:web`: start OpenCOR's Web app in development mode;
 - `format`: format OpenCOR's code and OpenCOR's Web app's code;
 - `format:check`: check that OpenCOR's code and OpenCOR's Web app's code are properly formatted;
-- `install`: install OpenCOR's dependencies;
-- `install:arm`: install OpenCOR's dependencies for [Windows](https://en.wikipedia.org/wiki/Microsoft_Windows)/[Linux](https://en.wikipedia.org/wiki/Linux) on [ARM](https://en.wikipedia.org/wiki/ARM_architecture_family);
 - `lint`: lint OpenCOR's code and OpenCOR's Web app's code;
 - `package`: (build and) package OpenCOR for the current platform;
-- `package:arm`: (build and) package OpenCOR for [Windows](https://en.wikipedia.org/wiki/Microsoft_Windows) on [ARM](https://en.wikipedia.org/wiki/ARM_architecture_family) for the current platform;
 - `publish:web`: publish OpenCOR's Web app on [npm](https://npmjs.com/);
 - `start`: start OpenCOR in production mode; and
-- `start:arm`: start OpenCOR for [Windows](https://en.wikipedia.org/wiki/Microsoft_Windows) on [ARM](https://en.wikipedia.org/wiki/ARM_architecture_family) in production mode; and
 - `start:web`: start OpenCOR's Web app in production mode.
-
-<a name="note" ></a>
-
-**Note:** scripts that have an `:arm` suffix are only to be used when wanting to target [Windows](https://en.wikipedia.org/wiki/Microsoft_Windows) on [ARM](https://en.wikipedia.org/wiki/ARM_architecture_family) or installing on [Linux](https://en.wikipedia.org/wiki/Linux) on [ARM](https://en.wikipedia.org/wiki/ARM_architecture_family). The corresponding generic scripts only target [Windows](https://en.wikipedia.org/wiki/Microsoft_Windows) on [Intel](https://en.wikipedia.org/wiki/List_of_Intel_processors) (and [Linux](https://en.wikipedia.org/wiki/Linux)/[macOS](https://en.wikipedia.org/wiki/MacOS) on [Intel](https://en.wikipedia.org/wiki/List_of_Intel_processors)/[ARM](https://en.wikipedia.org/wiki/ARM_architecture_family), depending on the operating system and on the C/C++ toolchain).

package.json

@@ -32,24 +32,17 @@
   },
   "scripts": {
     "build": "pnpm build:libopencor && electron-vite build",
-    "build:arm": "pnpm build:libopencor:arm && electron-vite build",
     "build:libopencor": "cmake-js build -B Release -O out/libOpenCOR",
-    "build:libopencor:arm": "cmake-js build -a arm64 -B Release -O out/libOpenCOR",
     "build:web": "cd ./src/renderer && vite build",
     "clean": "node res/clean.js",
-    "clean:all": "pnpm clean && pnpm store prune",
     "dev": "pnpm build:libopencor && electron-vite dev --watch",
-    "dev:arm": "pnpm build:libopencor:arm && electron-vite dev --watch",
     "dev:web": "cd ./src/renderer && vite dev",
     "format": "prettier --log-level silent --write . && clang-format -i src/libopencor/src/*",
     "format:check": "prettier --log-level silent --check . && clang-format --dry-run -Werror src/libopencor/src/*",
-    "install:arm": "pnpm install --config.target_arch=arm64",
     "lint": "eslint --fix .",
     "package": "pnpm build && electron-builder",
-    "package:arm": "pnpm build:arm && electron-builder --arm64",
     "publish:web": "pnpm publish ./src/renderer",
     "start": "pnpm build:libopencor && electron-vite preview",
-    "start:arm": "pnpm build:libopencor:arm && electron-vite preview",
     "start:web": "pnpm build:web && cd ./src/renderer && vite preview"
   },
   "devDependencies": {