Merge 6df5215 into e162f8c

loopbackio · Dec 8, 2021 · 01e8807 · 01e8807
2 parents e162f8c + 6df5215
commit 01e8807
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 15 deletions.
diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml
@@ -20,25 +20,29 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        node-version: [10, 12, 14, 16]
+        node-version: [10, 12, 14, 16, 17]
         include:
           - os: macos-latest
-            node_version: 14
+            node_version: 16
           - os: windows-latest
-            node_version: 14
+            node_version: 16
       fail-fast: false
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v1
         with:
           node-version: ${{ matrix.node-version }}
+      - name: Update NPM (Node.js v10)
+        if: matrix.node-version == '10'
+        run: npm install --global npm@7
       - name: Update NPM
-        if: matrix.os != 'macos-latest'
-        run: npm install --global npm
-      - name: Update NPM (macOS)
-        if: matrix.os == 'macos-latest'
-        run: npm install --global --force npm
+        # if: matrix.os != 'macos-latest'
+        if: matrix.node-version != '10'
+        run: npm install --global npm@8
+      # - name: Update NPM (macOS)
+        # if: matrix.os == 'macos-latest'
+        # run: npm install --global --force npm
       - name: Bootstrap project
         run: npm ci --ignore-scripts
       - name: Run tests
@@ -67,10 +71,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Use Node.js 14
+      - name: Use Node.js 16
         uses: actions/setup-node@v2
         with:
-          node-version: 14
+          node-version: 16
       - name: Bootstrap project
         run: npm ci --ignore-scripts
       - name: Verify code linting
@@ -83,10 +87,10 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Use Node.js 14
+      - name: Use Node.js 16
         uses: actions/setup-node@v2
         with:
-          node-version: 14
+          node-version: 16
       - name: Bootstrap project
         run: npm ci --ignore-scripts
       - name: Verify commit linting

diff --git a/.travis.yml b/.travis.yml
@@ -4,13 +4,22 @@ arch:
   - arm64
   - ppc64le
   - s390x
+os: linux
+dist: bionic
 language: node_js
 node_js:
   - 10
   - 12
   - 14
   - 16
-install:
-  - npm install --global npm
-  - npm ci --ignore-scripts
+  - 17
+before_install: |
+  NODEJS_VERSION=$(node --version)
+  if [ 'v10' = "${NODEJS_VERSION%%.*}" ]
+  then
+    npm install --global npm@7
+  else
+    npm install --global npm@8
+  fi
+install: npm ci --ignore-scripts
 script: npm test --ignore-scripts