Skip to content

Merge main into releases/v2 #1932

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

Jump to bottom
Merged
henrymercer merged 15 commits into from
Oct 9, 2023
Merged

Merge main into releases/v2 #1932

henrymercer merged 15 commits into from
Oct 9, 2023

Conversation

@github-actions
Copy link
Contributor

@github-actions github-actions bot commented Oct 9, 2023

Merging 18e6c39 into releases/v2.

Conductor for this PR is @henrymercer.

Contains the following pull requests:

Please do the following:

  • Ensure the CHANGELOG displays the correct version and date.
  • Ensure the CHANGELOG includes all relevant, user-facing changes since the last release.
  • Check that there are not any unexpected commits being merged into the releases/v2 branch.
  • Ensure the docs team is aware of any documentation changes that need to be released.
  • Approve and merge this PR. Make sure Create a merge commit is selected rather than Squash and merge or Rebase and merge.
  • Merge the mergeback PR that will automatically be created once this PR is merged.

github-actions bot and others added 15 commits October 6, 2023 10:47
@github-actions
Update changelog and version after v2.22.0
fd3d786
@github-actions
Update checked-in dependencies
b6ea09e
@henrymercer
Merge pull request #1925 from github/mergeback/v2.22.0-to-main-2cb752a8
a2dc5ff 
Mergeback v2.22.0 refs/heads/releases/v2 into main
@mbg
Suppress Go workaround warning if autobuilder ran
4eccc6d
@aeisenberg
Add a fix for python 3.12
d091652 
The python extractor does not yet support 3.12. Check for this and
instead make sure we run python 3.11. Only need to check on windows
since we are extremely unlikely to be running 3.12 on linux or macos.
@aeisenberg
Add integration test
028bacb 
Also:

- Update changelog
- Fix comments in check_python script
@aeisenberg
Add a feature flag to turn this off for newer versions of codeql
669c610
@aeisenberg
Update CHANGELOG.md
94b6970
@aeisenberg
Merge pull request #1928 from github/aeisenberg/fix-python312
0d5c2e0 
Add a fix for python 3.12
@aeisenberg
Update CHANGELOG.md
0a0988c 
Add missing work and make it clear that failure only applies when trying to downgrade to 3.11.
@mbg
Merge branch 'main' into mbg/suppress-go-workaround-warning
ffaea6c
@mbg
Merge pull request #1926 from github/mbg/suppress-go-workaround-warning
faf91ca 
Suppress Go workaround warning if autobuilder ran
@henrymercer
Link PR and fix case of Python
5e34d08
@henrymercer
Merge pull request #1930 from github/aeisenberg-patch-1
18e6c39 
Update CHANGELOG.md
@github-actions
Update changelog for v2.22.1
8554648
@henrymercer henrymercer marked this pull request as ready for review October 9, 2023 09:48
@henrymercer henrymercer requested review from a team as code owners October 9, 2023 09:48
@henrymercer henrymercer merged commit fdcae64 into releases/v2 Oct 9, 2023
@henrymercer henrymercer deleted the update-v2.22.1-18e6c398c branch October 9, 2023 11:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@henrymercer henrymercer henrymercer approved these changes

Assignees

@henrymercer henrymercer

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@henrymercer @mbg @aeisenberg