Update dependencies

.github/workflows/build.yml

@@ -15,6 +15,7 @@ jobs:
         node:
           - '12'
           - '14'
+          - '16'
     name: Build and test (Node ${{ matrix.node }})
     steps:
       - name: Check out the code
@@ -25,6 +26,9 @@ jobs:
         with:
           node-version: ${{ matrix.node }}
 
+      - name: Update npm
+        run: npm i -g npm@latest
+
       - name: Cache Node modules
         uses: actions/[email protected]
         env:

.github/workflows/npm-publish.yml

@@ -6,6 +6,10 @@ on:
       - released
   workflow_dispatch:
     inputs:
+      npm:
+        default: "yes"
+        description: Publish to NPM?
+        required: true
       gpr:
         default: "yes"
         description: Publish to GPR?
@@ -66,8 +70,12 @@ jobs:
     strategy:
       matrix:
         registry:
+          - npm
           - gpr
         include:
+          - registry: npm
+            secret: NPM_TOKEN
+            registry_url: https://registry.npmjs.org/
           - registry: gpr
             secret: GITHUB_TOKEN
             registry_url: https://npm.pkg.github.com/

.github/workflows/push-tag.yml

@@ -21,6 +21,9 @@ jobs:
         with:
           node-version: ${{ env.NODE_VERSION }}
 
+      - name: Update npm
+        run: npm i -g npm@latest
+
       - name: Cache Node modules
         uses: actions/[email protected]
         env:

.github/workflows/sonarscan.yml

@@ -2,19 +2,27 @@ name: SonarCloud Analysis
 
 on:
   push:
-    branches: 
+    branches:
+      - master
+  pull_request:
+    branches:
       - master
   workflow_dispatch:
 
+env:
+  NODE_VERSION: "14"
+  SONARSCANNER: "true"
+
 jobs:
   build:
     name: SonarCloud Scan
     runs-on: ubuntu-latest
-    if: ${{ !contains(github.event.head_commit.message, '[ci skip]') || github.event_name == 'workflow_dispatch' }}
-    env:
-      NODE_VERSION: '14'
+    if: |
+      github.event_name == 'workflow_dispatch' ||
+      github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name && github.event.sender.login != 'dependabot[bot]' ||
+      !contains(github.event.head_commit.message, '[ci skip]')
     steps:
-      - name: Check out the code
+      - name: Check out the source code
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
@@ -24,6 +32,9 @@ jobs:
         with:
           node-version: ${{ env.NODE_VERSION }}
 
+      - name: Update npm
+        run: npm i -g npm@latest
+
       - name: Cache Node modules
         uses: actions/[email protected]
         env:
@@ -49,7 +60,7 @@ jobs:
           COLLECT_COVERAGE: "1"
 
       - name: Retrieve information from package.json
-        uses: myrotvorets/[email protected].2
+        uses: myrotvorets/[email protected].4
         id: ver
 
       - name: Fix paths in test-report.xml

lib/knex.ts

@@ -94,11 +94,11 @@ export class KnexPlugin extends BasePlugin<Knex> {
             return original.call(this, connection, query).then(
                 (result: unknown) => {
                     span.setStatus({ code: SpanStatusCode.OK }).end();
-                    return Promise.resolve(result);
+                    return result;
                 },
                 (e: Error) => {
                     span.setStatus({ code: SpanStatusCode.ERROR, message: e.message }).end();
-                    return Promise.reject(e);
+                    throw e;
                 },
             );
         };