Merge pull request #183 from julianmesa-gitkraken/update-CI-and-packages

Update ci and packages
Axosoft · Jul 12, 2024 · 718bfb2 · 718bfb2
2 parents 13a84d9 + 30bdf10
commit 718bfb2
Show file tree

Hide file tree

Showing 7 changed files with 683 additions and 1,078 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -13,16 +13,18 @@ jobs:
     name: "Linux Tests"
     strategy:
         matrix:
-          container: ["centos:7", "ubuntu:18.04"]
-          node: [12, 14]
+          container: ["ubuntu:20.04", "ubuntu:22.04", "ubuntu:24.04"]
+          node: [18, 20, 22]
     runs-on: ubuntu-latest
     container:
       image: ${{ matrix.container }}
+    env:
+      ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Use Node.js ${{ matrix.node }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
           check-latest: true
@@ -47,13 +49,13 @@ jobs:
     name: "MacOS Tests"
     strategy:
         matrix:
-          node: [12, 14]
+          node: [18, 20, 22]
     runs-on: macOS-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Use Node.js ${{ matrix.node }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
           check-latest: true
@@ -67,20 +69,18 @@ jobs:
     name: "Windows Tests"
     strategy:
         matrix:
-          node: [12, 14]
+          node: [18, 20, 22]
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Use Node.js ${{ matrix.node }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
           check-latest: true
 
       - run: |
           npm install --global yarn
-          npm install --global node-gyp@9.0.0
-          npm prefix -g | % {npm config set node_gyp "$_\node_modules\node-gyp\bin\node-gyp.js"}
           yarn
           yarn test
diff --git a/.gitignore b/.gitignore
@@ -31,6 +31,12 @@ lib
 # extraneous operating system items
 .DS_Store
 
+# Visual Studio Code
+.vscode/
+
+# IntelliJ WebStorm
+.idea/
+
 # ignore test folders
 nsfw-stress-test
 mockfs

diff --git a/binding.gyp b/binding.gyp
@@ -9,7 +9,7 @@
         ],
         "include_dirs": [
             "includes",
-            "<!@(node -p \"require('node-addon-api').include\")"
+            "<!(node -p \"require('node-addon-api').include_dir\")"
         ],
         "cflags!": ["-fno-exceptions"],
         "cflags_cc!": ["-fno-exceptions"],
@@ -29,10 +29,10 @@
                 ],
                 "msvs_settings": {
                     "VCCLCompilerTool": {
-                        "DisableSpecificWarnings": [ "4506", "4538", "4793" ]
+                        "DisableSpecificWarnings": [ ]
                     },
                     "VCLinkerTool": {
-                        "AdditionalOptions": [ "/ignore:4248" ]
+                        "AdditionalOptions": [ ]
                     }
                 }
             }],

diff --git a/includes/win32/Watcher.h b/includes/win32/Watcher.h
@@ -37,10 +37,10 @@ class Watcher
     void resizeBuffers(std::size_t size);
 
     std::string getUTF8Directory(std::wstring path) ;
-    bool Watcher::isExcluded(const std::wstring &fileName);
+    bool isExcluded(const std::wstring &fileName);
 
-    std::wstring Watcher::getWatchedPathFromHandle();
-    void Watcher::checkWatchedPath();
+    std::wstring getWatchedPathFromHandle();
+    void checkWatchedPath();
 
     std::atomic<bool> mRunning;
     SingleshotSemaphore mHasStartedSemaphore;

diff --git a/js/scripts/test.js b/js/scripts/test.js
@@ -3,10 +3,10 @@ const cp = require('child_process');
 if (process.platform !== 'win32' && process.platform !== 'darwin') {
   // When ran as a npm script we can invoke npm bins such as node-gyp and mocha directly
   exec('node-gyp rebuild', { env: { ...process.env, NSFW_TEST_SLOW: 1 } });
-  exec('mocha --exit --expose-gc js/spec/index-slow-spec.js');
+  exec('mocha --exit --v8-expose-gc js/spec/index-slow-spec.js');
   exec('node-gyp rebuild');
 }
-exec('mocha --exit --expose-gc js/spec/index-spec.js');
+exec('mocha --exit --v8-expose-gc js/spec/index-spec.js');
 
 /**
  * @param {string} commandline ...

diff --git a/package.json b/package.json
@@ -30,13 +30,14 @@
   ],
   "homepage": "https://github.com/axosoft/node-simple-file-watcher",
   "dependencies": {
-    "node-addon-api": "^5.0.0"
+    "node-addon-api": "*"
   },
   "devDependencies": {
-    "eslint": "^6.8.0",
+    "eslint": "8.x",
     "executive": "^1.6.3",
-    "fs-extra": "^7.0.0",
-    "mocha": "^7.1.1"
+    "fs-extra": "^11.2.0",
+    "globals": "^15.8.0",
+    "mocha": "^10.6.0"
   },
   "keywords": [
     "FileWatcher",