Address PR comment.

github · Jun 28, 2021 · 34ef49a · 34ef49a
1 parent 8f4c2c7
commit 34ef49a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml
@@ -830,14 +830,14 @@ jobs:
         runner/dist/codeql-runner-linux upload --sarif-file src/testdata/empty-sarif.sarif --repository $GITHUB_REPOSITORY --commit $GITHUB_SHA --ref $GITHUB_REF --github-url $GITHUB_SERVER_URL --github-auth ${{ github.token }}
 
   multi-language-repo_test-local-codeql:
-    needs: [check-js, check-node-modules]
+    needs: [check-js, check-node-modules, check-codeql-versions]
     runs-on: ubuntu-latest
 
     steps:
     - uses: actions/checkout@v2
     - name: Move codeql-action
       run: |
-        wget ${{ fromJson(needs.check-codeql-versions.outputs.nightly-url) }}
+        wget ${{ needs.check-codeql-versions.outputs.nightly-url }}
         mkdir ../action
         mv * .github ../action/
         mv ../action/tests/multi-language-repo/{*,.github} .

diff --git a/src/codeql.ts b/src/codeql.ts
@@ -314,9 +314,12 @@ export async function setupCodeQL(
   try {
     let codeqlFolder: string;
     let codeqlURLVersion: string;
-    if (codeqlURL?.startsWith("file://")) {
+    const parsedUrl: URL | undefined = codeqlURL
+      ? new URL(codeqlURL)
+      : undefined;
+    if (parsedUrl?.protocol === "file:") {
       codeqlFolder = await toolcache.extractTar(
-        codeqlURL.substr(7),
+        parsedUrl.pathname.substring(1),
         tempDir,
         logger
       );