Merge branch 'main' into patch-1

github · Oct 30, 2020 · fb10307 · fb10307
2 parents ea5ae18 + f0c568a
commit fb10307
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 12 deletions.
diff --git a/.github/workflows/python-deps.yml b/.github/workflows/python-deps.yml
@@ -43,9 +43,11 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: ./init
       with:
+        tools: latest
         languages: python
+        setup-python-dependencies: false
 
     - name: Test Auto Package Installation
       run: |
@@ -60,7 +62,8 @@ jobs:
         esac
         echo ${basePath}
 
-        find ${basePath}/hostedtoolcache/CodeQL -path "*x64/codeql" -exec $GITHUB_WORKSPACE/python-setup/auto_install_packages.py {} \;
+        codeql_version="0.0.0-$(cat "$GITHUB_WORKSPACE/src/defaults.json" | jq -r .bundleVersion | rev | cut -d - -f 1 | rev)"
+        $GITHUB_WORKSPACE/python-setup/auto_install_packages.py "${basePath}/hostedtoolcache/CodeQL/$codeql_version/x64/codeql"
     - name: Setup for extractor
       run: |
         echo $CODEQL_PYTHON
@@ -103,23 +106,28 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: ./init
       with:
+        tools: latest
         languages: python
+        setup-python-dependencies: false
 
     - name: Test Auto Package Installation
       run: |
         $cmd = $Env:GITHUB_WORKSPACE + "\\python-setup\\install_tools.ps1"
         powershell -File $cmd
 
         cd $Env:GITHUB_WORKSPACE\\${{ matrix.test_dir }}
-        py -3 $Env:GITHUB_WORKSPACE\\python-setup\\auto_install_packages.py C:\\hostedtoolcache\\windows\\CodeQL\\0.0.0-20200826\\x64\\codeql
+        $DefaultsPath = Join-Path (Join-Path $Env:GITHUB_WORKSPACE "src") "defaults.json"
+        $CodeQLBundleName = (Get-Content -Raw -Path $DefaultsPath | ConvertFrom-Json).bundleVersion
+        $CodeQLVersion = "0.0.0-" + $CodeQLBundleName.split("-")[-1]
+        py -3 $Env:GITHUB_WORKSPACE\\python-setup\\auto_install_packages.py C:\\hostedtoolcache\\windows\\CodeQL\\$CodeQLVersion\\x64\\codeql
     - name: Setup for extractor
       run: |
         echo $Env:CODEQL_PYTHON
 
-        py -3 $Env:GITHUB_WORKSPACE\\python-setup\\tests\\from_python_exe.py $Env:CODEQL_PYTHON 
+        py -3 $Env:GITHUB_WORKSPACE\\python-setup\\tests\\from_python_exe.py $Env:CODEQL_PYTHON
     - name: Verify packages installed
       run: |
         $cmd = $Env:GITHUB_WORKSPACE + "\\python-setup\\tests\\check_requests_123.ps1"
-        powershell -File $cmd ${{ matrix.python_version }}
+        powershell -File $cmd ${{ matrix.python_version }}
diff --git a/lib/codeql.js b/lib/codeql.js
diff --git a/lib/codeql.js.map b/lib/codeql.js.map
diff --git a/lib/defaults.json b/lib/defaults.json
@@ -1,3 +1,3 @@
 {
-    "bundleVersion": "codeql-bundle-20201008"
+    "bundleVersion": "codeql-bundle-20201028"
 }
diff --git a/lib/init-action.js b/lib/init-action.js
diff --git a/lib/init-action.js.map b/lib/init-action.js.map
diff --git a/src/codeql.ts b/src/codeql.ts
@@ -612,6 +612,7 @@ function getCodeQLForCmd(cmd: string): CodeQL {
         memoryFlag,
         threadsFlag,
         databasePath,
+        "--min-disk-free=1024", // Try to leave at least 1GB free
         "--format=sarif-latest",
         `--output=${sarifFile}`,
         addSnippetsFlag,

diff --git a/src/defaults.json b/src/defaults.json
@@ -1,3 +1,3 @@
 {
-	"bundleVersion": "codeql-bundle-20201008"
+	"bundleVersion": "codeql-bundle-20201028"
 }
diff --git a/src/init-action.ts b/src/init-action.ts
@@ -119,7 +119,10 @@ async function run() {
       logger
     );
 
-    if (config.languages.includes(Language.python)) {
+    if (
+      config.languages.includes(Language.python) &&
+      actionsUtil.getRequiredInput("setup-python-dependencies") === "true"
+    ) {
       try {
         await installPythonDeps(codeql, logger);
       } catch (err) {