Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge releases/v3 into releases/v2 #2250

Merged
merged 38 commits into from
Apr 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
5b74166
Move `BuildMode` to `util.ts`
henrymercer Apr 11, 2024
e37d0f3
Use direct tracing when autobuild build mode specified
henrymercer Apr 11, 2024
3d49faa
Use extraction via build mode in `autobuild` Action when available
henrymercer Apr 11, 2024
8f057a3
Apply network timeout fix to extraction with direct tracing
henrymercer Apr 11, 2024
cbe29f5
Run autobuild script via direct tracing when feature enabled
henrymercer Apr 11, 2024
2eaad47
Add changelog note
henrymercer Apr 12, 2024
aa4a08d
Add PR check for direct tracing
henrymercer Apr 12, 2024
f21d2d2
Merge branch 'main' into henrymercer/autobuild-with-direct-tracing
henrymercer Apr 12, 2024
a22989d
Mark commit not found as a user error too
henrymercer Apr 15, 2024
1ae9ce7
Update changelog and version after v3.25.0
github-actions[bot] Apr 15, 2024
d37ec9a
Update checked-in dependencies
github-actions[bot] Apr 15, 2024
e006461
Mark some `upload-sarif` errors as always configuration errors
henrymercer Apr 15, 2024
f2c09fb
fix handling of backport changelog
nickfyson Apr 15, 2024
24b71bd
Merge pull request #2239 from github/mergeback/v3.25.0-to-main-df5a14dc
henrymercer Apr 15, 2024
59771dd
Run PR check on Windows too
henrymercer Apr 15, 2024
14eab91
Improve changelog note
henrymercer Apr 15, 2024
ea78e51
Merge branch 'main' into henrymercer/autobuild-with-direct-tracing
henrymercer Apr 15, 2024
fc090c4
Bump the npm group with 4 updates
dependabot[bot] Apr 15, 2024
d8b8ad0
Update checked-in dependencies
github-actions[bot] Apr 15, 2024
b8e2556
Merge pull request #2242 from github/henrymercer/even-more-configurat…
henrymercer Apr 16, 2024
db2b739
Fix PR link in changelog
henrymercer Apr 16, 2024
71e6077
Merge branch 'main' into nickfyson/speculative-script-fix
nickfyson Apr 16, 2024
c7a8056
simplify while loop
nickfyson Apr 16, 2024
453a956
Merge pull request #2243 from github/dependabot/npm_and_yarn/npm-9b31…
nickfyson Apr 16, 2024
8566d50
Add regression test for double `--overwrite`
henrymercer Apr 16, 2024
ade98b9
Ensure `--overwrite` flag is only passed once
henrymercer Apr 16, 2024
18111b6
Merge pull request #2235 from github/henrymercer/autobuild-with-direc…
henrymercer Apr 16, 2024
9b87e0a
Merge pull request #2241 from github/nickfyson/speculative-script-fix
henrymercer Apr 16, 2024
ef66aea
Merge branch 'main' into henrymercer/ignore-already-specified-flags
henrymercer Apr 16, 2024
556b3bc
Add changelog note
henrymercer Apr 16, 2024
c4fb451
Merge pull request #2245 from github/henrymercer/ignore-already-speci…
henrymercer Apr 16, 2024
1c7e8b2
Update changelog for v3.25.1
github-actions[bot] Apr 17, 2024
c7f9125
Merge pull request #2248 from github/update-v3.25.1-c4fb45143
henrymercer Apr 17, 2024
06c30cc
Revert "Update version and changelog for v2.25.0"
github-actions[bot] Apr 17, 2024
c992dad
Revert "Update checked-in dependencies"
github-actions[bot] Apr 17, 2024
8aad228
Merge remote-tracking branch 'origin/releases/v3' into backport-v2.25…
henrymercer Apr 17, 2024
e4b5f9d
Update version and changelog for v2.25.1
github-actions[bot] Apr 17, 2024
948c1eb
Update checked-in dependencies
github-actions[bot] Apr 17, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .github/update-release-branch.py
Original file line number Diff line number Diff line change
Expand Up @@ -186,16 +186,17 @@ def process_changelog_for_backports(source_branch_major_version, target_branch_m
with open('CHANGELOG.md', 'r') as f:

# until we find the first section, just duplicate all lines
while True:
found_first_section = False
while not found_first_section:
line = f.readline()
if not line:
raise Exception('Could not find any change sections in CHANGELOG.md') # EOF

output += line
if line.startswith('## '):
line = line.replace(f'## {source_branch_major_version}', f'## {target_branch_major_version}')
# we have found the first section, so now handle things differently
break
found_first_section = True

output += line

# found_content tracks whether we hit two headings in a row
found_content = False
Expand Down
92 changes: 92 additions & 0 deletions .github/workflows/__autobuild-direct-tracing.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ See the [releases page](https://github.com/github/codeql-action/releases) for th

Note that the only difference between `v2` and `v3` of the CodeQL Action is the node version they support, with `v3` running on node 20 while we continue to release `v2` to support running on node 16. For example `3.22.11` was the first `v3` release and is functionally identical to `2.22.11`. This approach ensures an easy way to track exactly which features are included in different versions, indicated by the minor and patch version numbers.

## 2.25.1 - 17 Apr 2024

- We are rolling out a feature in April/May 2024 that improves the reliability and performance of analyzing code when analyzing a compiled language with the `autobuild` [build mode](https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages#codeql-build-modes). [#2235](https://github.com/github/codeql-action/pull/2235)
- Fix a bug where the `init` Action would fail if `--overwrite` was specified in `CODEQL_ACTION_EXTRA_OPTIONS`. [#2245](https://github.com/github/codeql-action/pull/2245)

## 2.25.0 - 15 Apr 2024

- The deprecated feature for extracting dependencies for a Python analysis has been removed. [#2224](https://github.com/github/codeql-action/pull/2224)
Expand Down
10 changes: 5 additions & 5 deletions lib/analyze-action.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/analyze-action.js.map

Large diffs are not rendered by default.

36 changes: 9 additions & 27 deletions lib/analyze.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading