Skip to content

Commit 7388c47

Browse files
authored
Merge branch 'main' into rvermeulen/deprecate-add-snippets
2 parents d7c48ef + 202b3b9 commit 7388c47

File tree

156 files changed

+2292
-1029
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

156 files changed

+2292
-1029
lines changed

.github/workflows/__submit-sarif-failure.yml

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/script/update-required-checks.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@ fi
2828
echo "Getting checks for $GITHUB_SHA"
2929

3030
# Ignore any checks with "https://", CodeQL, LGTM, and Update checks.
31-
# Also ignore the non-matrixed "Unit Tests" job that only runs on pushes to protected branches.
32-
CHECKS="$(gh api repos/github/codeql-action/commits/"${GITHUB_SHA}"/check-runs --paginate | jq --slurp --compact-output --raw-output '[.[].check_runs | .[].name | select(contains("https://") or . == "CodeQL" or . == "Dependabot" or . == "check-expected-release-files" or . == "Unit Tests" or contains("Update") or contains("update") or contains("test-setup-python-scripts") | not)] | unique | sort')"
31+
CHECKS="$(gh api repos/github/codeql-action/commits/"${GITHUB_SHA}"/check-runs --paginate | jq --slurp --compact-output --raw-output '[.[].check_runs.[] | select(.conclusion != "skipped") | .name | select(contains("https://") or . == "CodeQL" or . == "Dependabot" or . == "check-expected-release-files" or contains("Update") or contains("update") or contains("test-setup-python-scripts") | not)] | unique | sort')"
3332

3433
echo "$CHECKS" | jq
3534

CHANGELOG.md

+16
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,22 @@ Note that the only difference between `v2` and `v3` of the CodeQL Action is the
66

77
## [UNRELEASED]
88

9+
- Fix an issue where the disk usage system call used for telemetry would fail on MacOS ARM machines with System Integrity Protection disabled, and then surface a warning. The system call is now disabled for these machines. [#2434](https://github.com/github/codeql-action/pull/2434)
10+
11+
## 3.26.3 - 19 Aug 2024
12+
13+
- Fix an issue where the CodeQL Action could not write diagnostic messages on Windows. This issue did not impact analysis quality. [#2430](https://github.com/github/codeql-action/pull/2430)
14+
15+
## 3.26.2 - 14 Aug 2024
16+
17+
- Update default CodeQL bundle version to 2.18.2. [#2417](https://github.com/github/codeql-action/pull/2417)
18+
19+
## 3.26.1 - 13 Aug 2024
20+
21+
No user facing changes.
22+
23+
## 3.26.0 - 06 Aug 2024
24+
925
- _Deprecation:_ Swift analysis on Ubuntu runner images is no longer supported. Please migrate to a macOS runner if this affects you. [#2403](https://github.com/github/codeql-action/pull/2403)
1026
- Bump the minimum CodeQL bundle version to 2.13.5. [#2408](https://github.com/github/codeql-action/pull/2408)
1127
- _Deprecation:_ The `add-snippets` input on the `analyze` Action is deprecated and will be removed in the first release in August 2025. [#2436](https://github.com/github/codeql-action/pull/2436)

README.md

+8-7
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,18 @@ To provide the best experience to customers using older versions of GitHub Enter
3333

3434
For more information, see "[Code scanning: deprecation of CodeQL Action v2](https://github.blog/changelog/2024-01-12-code-scanning-deprecation-of-codeql-action-v2/)."
3535

36-
## Supported versions of the CodeQL CLI and GitHub Enterprise Server
36+
## Supported versions of the CodeQL Bundle and GitHub Enterprise Server
3737

38-
We typically release new minor versions of the CodeQL Action and CLI when a new minor version of GitHub Enterprise Server (GHES) is released. When a version of GHES is deprecated, the CodeQL Action and CLI releases that shipped with it are deprecated as well.
38+
We typically release new minor versions of the CodeQL Action and Bundle when a new minor version of GitHub Enterprise Server (GHES) is released. When a version of GHES is deprecated, the CodeQL Action and Bundle releases that shipped with it are deprecated as well.
3939

40-
| Recommended CodeQL Action | Recommended CodeQL CLI Version | GitHub Environment |
40+
| Recommended CodeQL Action | Recommended CodeQL Bundle Version | GitHub Environment |
4141
|---------|----------|--------------|
4242
| `v3` | default (do not pass a `tools` input) | GitHub.com |
43-
| `v3.24.11` | `v2.16.6` | Enterprise Server 3.13 |
44-
| `3.22.12` | `2.15.5` | Enterprise Server 3.12 |
45-
| `2.22.1` | `2.14.6` | Enterprise Server 3.11 |
46-
| `2.20.3` | `2.13.5` | Enterprise Server 3.10 |
43+
| `v3.25.11` | `2.17.6` | Enterprise Server 3.14 |
44+
| `v3.24.11` | `2.16.6` | Enterprise Server 3.13 |
45+
| `v3.22.12` | `2.15.5` | Enterprise Server 3.12 |
46+
| `v2.22.1` | `2.14.6` | Enterprise Server 3.11 |
47+
| `v2.20.3` | `2.13.5` | Enterprise Server 3.10 |
4748

4849
CodeQL Action `v2` will stop receiving updates when GHES 3.11 is deprecated.
4950

lib/analyze-action.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/analyze-action.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/codeql.js

+3-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/codeql.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/codeql.test.js

+9-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/codeql.test.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/config-utils.js

+7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/config-utils.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/defaults.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"bundleVersion": "codeql-bundle-v2.18.1",
3-
"cliVersion": "2.18.1",
4-
"priorBundleVersion": "codeql-bundle-v2.18.0",
5-
"priorCliVersion": "2.18.0"
2+
"bundleVersion": "codeql-bundle-v2.18.2",
3+
"cliVersion": "2.18.2",
4+
"priorBundleVersion": "codeql-bundle-v2.18.1",
5+
"priorCliVersion": "2.18.1"
66
}

lib/diagnostics.js

+10-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)