From 804ca3e1a73c772b11455fb2bf54a8cecee3441d Mon Sep 17 00:00:00 2001 From: Henry Mercer Date: Mon, 9 May 2022 11:29:53 +0100 Subject: [PATCH 1/3] Actions: Fetch CodeQL CLI using `gh` rather than third-party Action --- .github/workflows/query-list.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/query-list.yml b/.github/workflows/query-list.yml index c6ff0aa1153..6bd1d3a5bf3 100644 --- a/.github/workflows/query-list.yml +++ b/.github/workflows/query-list.yml @@ -30,20 +30,14 @@ jobs: with: python-version: 3.8 - name: Download CodeQL CLI - uses: dsaltares/fetch-gh-release-asset@aa37ae5c44d3c9820bc12fe675e8670ecd93bd1c - with: - repo: "github/codeql-cli-binaries" - version: "latest" - file: "codeql-linux64.zip" - token: ${{ secrets.GITHUB_TOKEN }} + uses: ./codeql/.github/actions/fetch-codeql - name: Unzip CodeQL CLI run: unzip -d codeql-cli codeql-linux64.zip - name: Build code scanning query list run: | - PATH="$PATH:codeql-cli/codeql" python codeql/misc/scripts/generate-code-scanning-query-list.py > code-scanning-query-list.csv + python codeql/misc/scripts/generate-code-scanning-query-list.py > code-scanning-query-list.csv - name: Upload code scanning query list uses: actions/upload-artifact@v3 with: name: code-scanning-query-list path: code-scanning-query-list.csv - From 198c96982cab425773660c7f01370431f9cca6b8 Mon Sep 17 00:00:00 2001 From: Henry Mercer Date: Mon, 9 May 2022 14:30:41 +0100 Subject: [PATCH 2/3] Add a comment to explain the unusual Action path --- .github/workflows/query-list.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/query-list.yml b/.github/workflows/query-list.yml index 6bd1d3a5bf3..952e5783e1c 100644 --- a/.github/workflows/query-list.yml +++ b/.github/workflows/query-list.yml @@ -30,6 +30,7 @@ jobs: with: python-version: 3.8 - name: Download CodeQL CLI + # Look under the `codeql` directory , as this is where we checked out the `github/codeql` repo uses: ./codeql/.github/actions/fetch-codeql - name: Unzip CodeQL CLI run: unzip -d codeql-cli codeql-linux64.zip From 71d1069a0a4a0b41fe5e39e65df2b72126da98df Mon Sep 17 00:00:00 2001 From: Henry Mercer Date: Mon, 9 May 2022 14:31:05 +0100 Subject: [PATCH 3/3] Fix typo --- .github/workflows/query-list.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/query-list.yml b/.github/workflows/query-list.yml index 952e5783e1c..f8f2d451adb 100644 --- a/.github/workflows/query-list.yml +++ b/.github/workflows/query-list.yml @@ -30,7 +30,7 @@ jobs: with: python-version: 3.8 - name: Download CodeQL CLI - # Look under the `codeql` directory , as this is where we checked out the `github/codeql` repo + # Look under the `codeql` directory, as this is where we checked out the `github/codeql` repo uses: ./codeql/.github/actions/fetch-codeql - name: Unzip CodeQL CLI run: unzip -d codeql-cli codeql-linux64.zip