From 2da5fbf0d45ad52ccce2d5573d6a5e0730f8d80d Mon Sep 17 00:00:00 2001 From: Robin Neatherway Date: Thu, 8 Oct 2020 14:48:20 +0100 Subject: [PATCH 1/2] Update default CodeQL version to codeql-bundle-20201008 --- lib/defaults.json | 2 +- src/defaults.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/defaults.json b/lib/defaults.json index f5e364e85..a19748cfb 100644 --- a/lib/defaults.json +++ b/lib/defaults.json @@ -1,3 +1,3 @@ { - "bundleVersion": "codeql-bundle-20200826" + "bundleVersion": "codeql-bundle-20201008" } diff --git a/src/defaults.json b/src/defaults.json index 097a83fcf..0ba345843 100644 --- a/src/defaults.json +++ b/src/defaults.json @@ -1,3 +1,3 @@ { - "bundleVersion": "codeql-bundle-20200826" + "bundleVersion": "codeql-bundle-20201008" } From f79717f3c33c75201c2f643119b813672c45dd9e Mon Sep 17 00:00:00 2001 From: Robin Neatherway Date: Tue, 13 Oct 2020 10:19:15 +0100 Subject: [PATCH 2/2] Start analysing merge commit for PRs --- .github/workflows/codeql.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index d3dda5dc6..e5e35000a 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -14,16 +14,6 @@ jobs: steps: - uses: actions/checkout@v2 - with: - # Must fetch at least the immediate parents so that if this is - # a pull request then we can checkout the head of the pull request. - fetch-depth: 2 - - # If this run was triggered by a pull request event then checkout - # the head of the pull request instead of the merge commit. - - run: git checkout HEAD^2 - if: ${{ github.event_name == 'pull_request' }} - - uses: ./init with: languages: javascript