Skip to content

Merge rc/3.12 into main #15189

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

Merged
merged 18 commits into from
Dec 22, 2023
Merged

Merge rc/3.12 into main #15189

merged 18 commits into from
Dec 22, 2023

Conversation

adityasharad
Copy link
Collaborator

Includes changes from codeql-cli-2.15.5 and the subsequent post-release steps, which were merged into rc/3.12.
This prepares main for the next release.

Prepared by checking out main, merging in rc/3.12, no conflicts to resolve, then opening this PR against main.

erik-krogh and others added 18 commits December 14, 2023 20:43
e.g. the `lib.es5.d.ts` file was not excluded
`this` didn't refer to anything specific, and it was in fact `undefined` in the context it was invoked. There was already a  `let typeTable = this;` further up (where `this` refers to the class instance), so I used `typeTable`.
JS: TypeScript extractor fixes into rc/3.12
Bazel/CMake: use bazelisk to use correct bazel version
Release preparation for version 2.15.5
…15.5

Post-release preparation for codeql-cli-2.15.5
@adityasharad
Copy link
Collaborator Author

Integration test failure is known, due to maintenance on internal GHES instance.

@adityasharad adityasharad merged commit bbe3269 into main Dec 22, 2023
@adityasharad adityasharad deleted the adityasharad/merge/3.12-main branch December 22, 2023 19:26
danielsamhinojosa

This comment was marked as spam.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants