Skip to content

Commit 416ad3d

Browse files
committed
Merge branch 'main' into henrymercer/bypass-toolcache-feature-flag
2 parents e1cd41a + 8bc36d5 commit 416ad3d

13 files changed

Lines changed: 98 additions & 18 deletions

.github/workflows/debug-artifacts-failure.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
strategy:
2222
matrix:
2323
os: [ubuntu-latest, macos-latest]
24-
name: Failure Expected - Upload debug artifacts
24+
name: Upload debug artifacts after failure in analyze
2525
continue-on-error: true
2626
timeout-minutes: 45
2727
runs-on: ${{ matrix.os }}
@@ -47,6 +47,7 @@ jobs:
4747
- uses: ./../action/analyze
4848
id: analysis
4949
with:
50+
expect-error: true
5051
ram: 1
5152
env:
5253
TEST_MODE: true

analyze/action.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,10 @@ inputs:
6666
default: ${{ github.token }}
6767
matrix:
6868
default: ${{ toJson(matrix) }}
69+
expect-error:
70+
description: "[Internal] It is an error to use this input outside of integration testing of the codeql-action."
71+
required: false
72+
default: "false"
6973
outputs:
7074
db-locations:
7175
description: A map from language to absolute path for each database created by CodeQL.

lib/actions-util.js

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

lib/actions-util.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.

lib/analyze-action.js

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

lib/analyze-action.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.

lib/api-compatibility.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{ "maximumVersion": "3.6", "minimumVersion": "3.2" }
1+
{ "maximumVersion": "3.7", "minimumVersion": "3.2" }

0 commit comments

Comments
 (0)