Merge branch 'main' into robertbrignull/external-token-option

github · Jan 14, 2021 · c8abbce · c8abbce
2 parents 97a70e6 + 3d63fa4
commit c8abbce
Show file tree

Hide file tree

Showing 13 changed files with 84 additions and 13 deletions.
diff --git a/.github/workflows/integration-testing.yml b/.github/workflows/integration-testing.yml
@@ -336,7 +336,7 @@ jobs:
     - name: Build code
       run: |
         . ./codeql-runner/codeql-env.sh
-        dotnet build
+        $CODEQL_RUNNER dotnet build
 
     - name: Run analyze
       run: |
@@ -372,7 +372,7 @@ jobs:
       shell: powershell
       run: |
         cat ./codeql-runner/codeql-env.sh | Invoke-Expression
-        dotnet build
+        & $Env:CODEQL_RUNNER dotnet build
 
     - name: Run analyze
       run: |
@@ -408,7 +408,7 @@ jobs:
       shell: bash
       run: |
         . ./codeql-runner/codeql-env.sh
-        dotnet build
+        $CODEQL_RUNNER dotnet build
 
     - name: Run analyze
       run: |

diff --git a/lib/tracer-config.js b/lib/tracer-config.js
diff --git a/lib/tracer-config.js.map b/lib/tracer-config.js.map
diff --git a/lib/tracer-config.test.js b/lib/tracer-config.test.js