ci test updates (#62)

* add node 16.x testing * disable watch dir when platform not win or mac
haraka · Jun 11, 2021 · 4567de8 · 4567de8
1 parent 5f21b99
commit 4567de8
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 34 deletions.
diff --git a/.github/workflows/ci-test-win.yml b/.github/workflows/ci-test-win.yml
@@ -14,11 +14,11 @@ jobs:
     strategy:
       matrix:
         os: [ windows-latest ]
-        node-version: [10.x, 12.x]
+        node-version: [ 12.x, 14.x, 16.x ]
       fail-fast: false
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
       name: git checkout
       with:
         fetch-depth: 1

diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml
@@ -11,11 +11,11 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest ]
-        node-version: [10.x, 12.x]
+        node-version: [ 12.x, 14.x, 16.x ]
       fail-fast: false
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
       name: git checkout
       with:
         fetch-depth: 1

diff --git a/.github/workflows/coveralls.yml b/.github/workflows/coveralls.yml
@@ -20,9 +20,11 @@ jobs:
       with:
         version: 12.x
 
-    - name: install, run
+    - name: Install
+      run: npm install
+
+    - name: Test
       run: |
-        npm install
         npm install nyc codecov
         npm run cover
 

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -10,10 +10,10 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [ 12.x ]
+        node-version: [ 14.x ]
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
       name: git checkout
       with:
         fetch-depth: 1
@@ -23,10 +23,10 @@ jobs:
       with:
         node-version: ${{ matrix.node-version }}
 
-    - name: npm install
+    - name: Install
       run: npm install
 
-    - name: Lint using eslint
+    - name: Lint
       run: npm run lint
 
       env:

diff --git a/Changes.md b/Changes.md
@@ -1,11 +1,14 @@
 
-## 1.N.NN - 20YY-MM-DD
+## NEXT - 202Y-MM-DD
 
-## 1.0.19 - 2019-MM-DD
 
+## 1.0.19 - 2021-06-10
+
+- configfile: disable watch dir when platform not mac or win
 - configfile: convert to es6 class
 - configfile.read_dir: promisify
 - configfile: use simpler es6 `for..in` and `for..of`
+- getDir tests, use os.EOL for comparison
 
 
 ## 1.0.18 - 2019-10-11

diff --git a/configfile.js b/configfile.js
@@ -356,6 +356,9 @@ class cfreader {
         if (this._watchers[dirPath]) return;
         const watchOpts = { persistent: false, recursive: true }
 
+        // recursive is only supported on Windows (win32, win64) and macOS (darwin)
+        if (!/win/.test(process.platform)) watchOpts.recursive = false
+
         this._watchers[dirPath] = fs.watch(dirPath, watchOpts, (fse, filename) => {
             // console.log(`event: ${fse}, ${filename}`);
             if (!filename) return;

diff --git a/test/config.js b/test/config.js
@@ -492,30 +492,30 @@ describe('getDir', function () {
         }
         const self = this;
         let callCount = 0;
-        function getDirDone (err, files) {
-            // console.log('Loading: test/config/dir');
-            if (err) console.error(err);
-            callCount++;
-            if (callCount === 1) {
-                // console.log(files);
-                assert.equal(err, null);
-                assert.equal(files.length, 3);
-                assert.equal(files[0].data, `contents1${os.EOL}`);
-                assert.equal(files[2].data, `contents3${os.EOL}`);
-                fs.writeFile(tmpFile, 'contents4\n', (err2, res) => {
-                    assert.equal(err2, null);
-                    // console.log('file touched, waiting for callback');
-                    // console.log(res);
-                });
-            }
-            if (callCount === 2) {
-                assert.equal(files[3].data, 'contents4\n');
-                done();
-            }
-        }
+
         function getDir () {
             const opts2 = { type: 'binary', watchCb: getDir };
-            self.config.getDir('dir', opts2, getDirDone);
+            self.config.getDir('dir', opts2, (err, files) => {
+                // console.log('Loading: test/config/dir');
+                if (err) console.error(err);
+                callCount++;
+                if (callCount === 1) {
+                    // console.log(files);
+                    assert.equal(err, null);
+                    assert.equal(files.length, 3);
+                    assert.equal(files[0].data, `contents1${os.EOL}`);
+                    assert.equal(files[2].data, `contents3${os.EOL}`);
+                    fs.writeFile(tmpFile, 'contents4\n', (err2, res) => {
+                        assert.equal(err2, null);
+                        // console.log('file touched, waiting for callback');
+                        // console.log(res);
+                    });
+                }
+                if (callCount === 2) {
+                    assert.equal(files[3].data, 'contents4\n');
+                    done();
+                }
+            });
         }
         getDir();
     })