Merge branch 'main' into henrymercer/bypass-toolcache-feature-flag

github · Aug 17, 2022 · 416ad3d · 416ad3d
2 parents e1cd41a + 8bc36d5
commit 416ad3d
Show file tree

Hide file tree

Showing 13 changed files with 98 additions and 18 deletions.
diff --git a/.github/workflows/debug-artifacts-failure.yml b/.github/workflows/debug-artifacts-failure.yml
@@ -21,7 +21,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest]
-    name: Failure Expected - Upload debug artifacts
+    name: Upload debug artifacts after failure in analyze
     continue-on-error: true
     timeout-minutes: 45
     runs-on: ${{ matrix.os }}
@@ -47,6 +47,7 @@ jobs:
       - uses: ./../action/analyze
         id: analysis  
         with:
+          expect-error: true
           ram: 1
         env:
           TEST_MODE: true

diff --git a/analyze/action.yml b/analyze/action.yml
@@ -66,6 +66,10 @@ inputs:
     default: ${{ github.token }}
   matrix:
     default: ${{ toJson(matrix) }}
+  expect-error:
+    description: "[Internal] It is an error to use this input outside of integration testing of the codeql-action."
+    required: false
+    default: "false"
 outputs:
   db-locations:
     description: A map from language to absolute path for each database created by CodeQL.

diff --git a/lib/actions-util.js b/lib/actions-util.js
diff --git a/lib/actions-util.js.map b/lib/actions-util.js.map
diff --git a/lib/analyze-action.js b/lib/analyze-action.js
diff --git a/lib/analyze-action.js.map b/lib/analyze-action.js.map
diff --git a/lib/api-compatibility.json b/lib/api-compatibility.json
@@ -1 +1 @@
-{ "maximumVersion": "3.6", "minimumVersion": "3.2" }
+{ "maximumVersion": "3.7", "minimumVersion": "3.2" }