Skip to content

Commit 5b32ed0

Browse files
Address PR comment.
1 parent 8f4c2c7 commit 5b32ed0

File tree

4 files changed

+10
-7
lines changed

4 files changed

+10
-7
lines changed

.github/workflows/pr-checks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -830,14 +830,14 @@ jobs:
830830
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 }}
831831
832832
multi-language-repo_test-local-codeql:
833-
needs: [check-js, check-node-modules]
833+
needs: [check-js, check-node-modules, check-codeql-versions]
834834
runs-on: ubuntu-latest
835835

836836
steps:
837837
- uses: actions/checkout@v2
838838
- name: Move codeql-action
839839
run: |
840-
wget ${{ fromJson(needs.check-codeql-versions.outputs.nightly-url) }}
840+
wget ${{ needs.check-codeql-versions.outputs.nightly-url }}
841841
mkdir ../action
842842
mv * .github ../action/
843843
mv ../action/tests/multi-language-repo/{*,.github} .

lib/codeql.js

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/codeql.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/codeql.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,9 +314,11 @@ export async function setupCodeQL(
314314
try {
315315
let codeqlFolder: string;
316316
let codeqlURLVersion: string;
317-
if (codeqlURL?.startsWith("file://")) {
317+
const parsedUrl: URL | undefined =
318+
codeqlURL && codeqlURL !== "latest" ? new URL(codeqlURL) : undefined;
319+
if (parsedUrl?.protocol === "file:") {
318320
codeqlFolder = await toolcache.extractTar(
319-
codeqlURL.substr(7),
321+
parsedUrl.pathname.substring(1),
320322
tempDir,
321323
logger
322324
);

0 commit comments

Comments
 (0)