Skip to content

Merge main into releases/v3 #2052

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.

Sign up for GitHub

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

Merged
adityasharad merged 29 commits into from
Dec 22, 2023
Merged

Merge main into releases/v3 #2052

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
dcf89a7
Bump the npm group with 4 updates
dependabot[bot] Dec 13, 2023
0d8f348
Update checked-in dependencies
github-actions[bot] Dec 13, 2023
95591ba
Merge branch 'main' into dependabot/npm_and_yarn/npm-0a98872b3d
henrymercer Dec 13, 2023
2b2fb6b
Update changelog and version after v3.22.11
github-actions[bot] Dec 13, 2023
7813bda
Update checked-in dependencies
github-actions[bot] Dec 13, 2023
ebf5a83
Merge pull request #2035 from github/mergeback/v3.22.11-to-main-b374143c
nickfyson Dec 13, 2023
511f073
Merge pull request #2033 from github/dependabot/npm_and_yarn/npm-0a98…
henrymercer Dec 13, 2023
8e4a6c7
improve handling of changelog processing for backports
nickfyson Dec 15, 2023
e0c2b0a
change version numbers inside processing function as well
nickfyson Dec 15, 2023
ee53012
Apply suggestions from code review
nickfyson Dec 15, 2023
fda1796
rename regex for clarity
nickfyson Dec 15, 2023
0724061
preserve trailing whitespace when transforming CHANGELOG
nickfyson Dec 18, 2023
8e086df
raise explicit exception if EOF found when looking for changelog sect…
nickfyson Dec 18, 2023
cda785e
add note on versioning approach to changelog
nickfyson Dec 18, 2023
144b7d5
Bump the npm group with 2 updates (#2045)
dependabot[bot] Dec 18, 2023
0978396
Merge pull request #2041 from github/nickfyson/fix-changelog-backports
nickfyson Dec 18, 2023
8478e2a
clarify comment on versions in the changelog
nickfyson Dec 18, 2023
2603673
clarify comment on versions in the changelog
nickfyson Dec 18, 2023
7e187e1
Merge pull request #2044 from github/nickfyson/update-changelog
nickfyson Dec 18, 2023
fe1e55f
Update default bundle to codeql-bundle-v2.15.5
github-actions[bot] Dec 19, 2023
a99bd84
Add changelog note
github-actions[bot] Dec 19, 2023
a110746
Merge pull request #2047 from github/update-bundle/codeql-bundle-v2.15.5
adityasharad Dec 20, 2023
a42c9a2
update required checks script to handle release branches
nickfyson Dec 20, 2023
9ed5fc7
add note about backporting check changes to v2 branch
nickfyson Dec 20, 2023
49812ec
Merge pull request #2050 from github/nickfyson/add-releases-ini
nickfyson Dec 20, 2023
658e3c6
Fix type error
angelapwen Dec 21, 2023
0be9290
Typecast `OLDEST_SUPPORTED_MAJOR_VERSION` when defined
angelapwen Dec 21, 2023
40cb08c
Merge pull request #2051 from github/angelapwen/patch-release-script
adityasharad Dec 21, 2023
c1cf794
Update changelog for v3.22.12
github-actions[bot] Dec 22, 2023
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
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Note that the only difference between `v2` and `v3` of the CodeQL Action is the

## [UNRELEASED]

No user facing changes.
- Update default CodeQL bundle version to 2.15.5. [#2047](https://github.com/github/codeql-action/pull/2047)

## 3.22.11 - 13 Dec 2023

Expand Down
8 changes: 4 additions & 4 deletions lib/defaults.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"bundleVersion": "codeql-bundle-v2.15.4",
"cliVersion": "2.15.4",
"priorBundleVersion": "codeql-bundle-v2.15.3",
"priorCliVersion": "2.15.3"
"bundleVersion": "codeql-bundle-v2.15.5",
"cliVersion": "2.15.5",
"priorBundleVersion": "codeql-bundle-v2.15.4",
"priorCliVersion": "2.15.4"
}
8 changes: 4 additions & 4 deletions src/defaults.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"bundleVersion": "codeql-bundle-v2.15.4",
"cliVersion": "2.15.4",
"priorBundleVersion": "codeql-bundle-v2.15.3",
"priorCliVersion": "2.15.3"
"bundleVersion": "codeql-bundle-v2.15.5",
"cliVersion": "2.15.5",
"priorBundleVersion": "codeql-bundle-v2.15.4",
"priorCliVersion": "2.15.4"
}