From a030e75b004ab6e65f76e22ab931bcdcc31ede65 Mon Sep 17 00:00:00 2001
From: agracio <agracio@users.noreply.github.com>
Date: Thu, 26 Sep 2024 16:49:34 +0100
Subject: [PATCH] Adding Electron 32 build

---
 .github/workflows/build.yml |  5 ++++-
 package-lock.json           | 10 ++++------
 package.json                |  2 +-
 tools/mergeTests.js         |  6 ------
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b2aa65a..87768c3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -6,12 +6,13 @@ on:
       build-version:
         description: 'Electron version to build'
         required: true
-        default: '31.0.0'
+        default: '29.0.0'
         type: choice
         options:
         - 29.0.0
         - 30.0.0
         - 31.0.0
+        - 32.0.0
       # test-version:
       #   description: 'Electron version to test build'
       #   required: true
@@ -55,6 +56,8 @@ jobs:
              echo "test-version=30.5.1" >> $GITHUB_OUTPUT
            elif [[ ${{ inputs.build-version }} == '31.0.0' ]]; then
              echo "test-version=31.6.0" >> $GITHUB_OUTPUT
+           elif [[ ${{ inputs.build-version }} == '32.0.0' ]]; then
+             echo "test-version=32.1.2" >> $GITHUB_OUTPUT
            fi 
           #  else
           #   core.setFailed("Unable to resolve Electron version for testing")
diff --git a/package-lock.json b/package-lock.json
index f6ce279..b664eca 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,7 +12,7 @@
       "dependencies": {
         "edge-cs": "npm:@agracio/edge-cs@^1.3.7",
         "follow-redirects": "^1.15.9",
-        "nan": "^2.20.0"
+        "nan": "git://github.com/oc-soft/npm-nan"
       },
       "devDependencies": {
         "electron": "=31.6.0",
@@ -1664,8 +1664,7 @@
     },
     "node_modules/nan": {
       "version": "2.20.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.20.0.tgz",
-      "integrity": "sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw==",
+      "resolved": "git+ssh://git@github.com/oc-soft/npm-nan.git#6c6e8aa4165384a1bf944c7ebc0f7cca5ced7bf0",
       "license": "MIT"
     },
     "node_modules/normalize-path": {
@@ -3479,9 +3478,8 @@
       "dev": true
     },
     "nan": {
-      "version": "2.20.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.20.0.tgz",
-      "integrity": "sha512-bk3gXBZDGILuuo/6sKtr0DQmSThYHLtNCdSdXk9YkxD/jK6X2vmCyyXBBxyqZ4XcnzTyYEAThfX3DCEnLf6igw=="
+      "version": "git+ssh://git@github.com/oc-soft/npm-nan.git#6c6e8aa4165384a1bf944c7ebc0f7cca5ced7bf0",
+      "from": "nan@git://github.com/oc-soft/npm-nan"
     },
     "normalize-path": {
       "version": "3.0.0",
diff --git a/package.json b/package.json
index ceab905..bf29bda 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
   "dependencies": {
     "edge-cs": "npm:@agracio/edge-cs@^1.3.7",
     "follow-redirects": "^1.15.9",
-    "nan": "^2.20.0"
+    "nan": "git://github.com/oc-soft/npm-nan"
   },
   "devDependencies": {
     "electron": "=31.6.0",
diff --git a/tools/mergeTests.js b/tools/mergeTests.js
index eb4087d..b7e3891 100644
--- a/tools/mergeTests.js
+++ b/tools/mergeTests.js
@@ -21,12 +21,6 @@ merge.merge(options).then(report => {
     marge.create(report, margeOptions).then(() => 
         {
             console.log(`Mochawesome report created: ${margeOptions.reportDir}/${margeOptions.reportFilename}`)
-            let stats = {
-                passing: report.stats.passes,
-                skipped: report.stats.pending,
-                failures: report.stats.failures
-            };
-            console.log(JSON.stringify(stats));
         }
     );
 })