Skip to content

Merge releases/v2 into releases/v1 #1438

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
merged 29 commits into from
Dec 14, 2022
Merged

Merge releases/v2 into releases/v1 #1438

merged 29 commits into from
Dec 14, 2022

Conversation

@github-actions
Copy link
Contributor

@github-actions github-actions bot commented Dec 14, 2022 •
edited by henrymercer
Loading

Merging 959cbb7 into releases/v1

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/v1 branch.
  • Ensure the docs team is aware of any documentation changes that need to be released.
  • Remove and re-add the "Update dependencies" label to the PR to trigger just this workflow.
  • Wait for the "Update dependencies" workflow to push a commit updating the dependencies.
  • Mark the PR as ready for review to trigger the full set of PR checks.
  • Approve and merge this PR. Make sure Create a merge commit is selected rather than Squash and merge or Rebase and merge.

dependabot bot and others added 28 commits December 8, 2022 17:36
@dependabot
Bump certifi in /python-setup/tests/poetry/python-3.8
4e81e29 
Bumps [certifi](https://github.com/certifi/python-certifi) from 2021.10.8 to 2022.12.7.
- [Release notes](https://github.com/certifi/python-certifi/releases)
- [Commits](certifi/python-certifi@2021.10.08...2022.12.07)

---
updated-dependencies:
- dependency-name: certifi
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
@aeisenberg
Merge pull request #1427 from github/dependabot/pip/python-setup/test…
6fec2ab 
…s/poetry/python-3.8/certifi-2022.12.7

Bump certifi from 2021.10.8 to 2022.12.7 in /python-setup/tests/poetry/python-3.8
Update changelog and version after v2.1.36
0133049
Update checked-in dependencies
e58b8d6
@cklin
Merge pull request #1429 from github/mergeback/v2.1.36-to-main-a669cc59
8960790 
Mergeback v2.1.36 refs/heads/releases/v2 into main
@henrymercer
Add telemetry for uploading failed runs
e67ad6a
@henrymercer
Handle non-string with inputs
a409f43
@henrymercer
Add regression test for upload: false
dc9c1c1
@henrymercer
Record the stack trace if applicable
118e294
@henrymercer
Update bundle version to codeql-bundle-20221211
5aced81
@henrymercer
Add changelog note
9438015
@nickfyson
remove use of query-string package
d827cf3
@nickfyson
use .has for searchParams instead of checking for undefined
54d25f5
@nickfyson
Merge pull request #1434 from github/nickfyson/remove-query-string
53ab991 
remove use of query-string package
@henrymercer
Reuse existing fields in post-init status report
b7b875e
@henrymercer
Remove debugging log statements
dd7c3ef
@henrymercer
Merge pull request #1432 from github/henrymercer/init-post-telemetry
899bf9c 
Add telemetry for uploading failed runs
@orhantoy
Add tests for CODE_SCANNING_REF
ccee4c6
@henrymercer
Merge branch 'main' into henrymercer/use-codeql-2.11.6
f629dad
@orhantoy
Make sure env is reset between tests
b7028af
@henrymercer
Merge pull request #1433 from github/henrymercer/use-codeql-2.11.6
37a4496 
Bump default CodeQL version to 2.11.6
@orhantoy
Merge pull request #1435 from github/orhantoy/add-CODE_SCANNING_REF-t…
d58039a 
…ests

Add tests for CODE_SCANNING_REF
Update changelog for v2.1.37
10ca836
@henrymercer
Merge pull request #1436 from github/update-v2.1.37-d58039a1
959cbb7 
Merge main into releases/v2
Revert "Update version and changelog for v1.1.36"
0d52bba 
This reverts commit d0b6402.
Revert "Update checked-in dependencies"
a0924e1 
This reverts commit 18b0d6e.
Merge remote-tracking branch 'origin/releases/v2' into update-v1.1.37…
536940c 
…-959cbb74
Update version and changelog for v1.1.37
85fac8b
@github-actions github-actions bot added the Update dependencies Trigger PR workflow to update dependencies label Dec 14, 2022
@henrymercer henrymercer added Update dependencies Trigger PR workflow to update dependencies and removed Update dependencies Trigger PR workflow to update dependencies labels Dec 14, 2022
@github-actions github-actions bot removed the Update dependencies Trigger PR workflow to update dependencies label Dec 14, 2022
@henrymercer henrymercer marked this pull request as ready for review December 14, 2022 14:11
@henrymercer henrymercer requested review from a team as code owners December 14, 2022 14:11
@henrymercer henrymercer merged commit 4b3fd91 into releases/v1 Dec 14, 2022
@henrymercer henrymercer deleted the update-v1.1.37-959cbb74 branch December 14, 2022 15:17
@aliscco aliscco mentioned this pull request Apr 28, 2023
Open
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.

6 participants

@henrymercer @aeisenberg @cklin @nickfyson @orhantoy