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.

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

Merge main into releases/v3 #2034

Merged
merged 22 commits into from
Dec 13, 2023
Merged

Merge main into releases/v3 #2034

merged 22 commits into from
Dec 13, 2023

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Dec 13, 2023 •
edited by nickfyson
Loading

Merging 64e61ba into releases/v3.

Conductor for this PR is @nickfyson.

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/v3 branch.
  • Ensure the docs team is aware of any documentation changes that need to be released.
  • 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.
  • Merge the mergeback PR that will automatically be created once this PR is merged.
  • Merge all backport PRs to older release branches, that will automatically be created once this PR is merged.

nickfyson and others added 22 commits December 7, 2023 14:07
@nickfyson
change to node20 for all actions
d651fbc
@nickfyson
upgrade node type definitions
f2d0c2e
@nickfyson
change to node20 for all actions
5b19bef
@nickfyson
reintroduce PR check that confirm action can be still be compiled on …
5b52b36 
…node16
@nickfyson
update version in various hardcoded locations
cc4fead
@nickfyson
update javascript files
3a9f6a8
@nickfyson
fix choice of older node version to test
303dec0
@github-actions
Update checked-in dependencies
bf51594
@nickfyson
add not about continuing testing on node 16
95be4b2
@nickfyson
switch check sarif action to node20
0bc194e
@nickfyson
Merge branch 'main' into nickfyson/node-20
1de8705
@github-actions
Update changelog and version after v2.22.10
691226e
@github-actions
Update checked-in dependencies
1bca5bf
@cklin
Merge pull request #2029 from github/mergeback/v2.22.10-to-main-305f6546
3c1878d 
Mergeback v2.22.10 refs/heads/releases/v2 into main
@dependabot @github-actions
Bump the actions group with 2 updates (#2024)
b995212 
* Bump the actions group with 2 updates

Bumps the actions group with 2 updates: [actions/setup-python](https://github.com/actions/setup-python) and [actions/setup-go](https://github.com/actions/setup-go).


Updates `actions/setup-python` from 4 to 5
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](actions/setup-python@v4...v5)

Updates `actions/setup-go` from 4 to 5
- [Release notes](https://github.com/actions/setup-go/releases)
- [Commits](actions/setup-go@v4...v5)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: actions
- dependency-name: actions/setup-go
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: actions
...

Signed-off-by: dependabot[bot] <support@github.com>

* Rebuild

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@nickfyson
Merge branch 'main' into nickfyson/node-20
b974542
@nickfyson @henrymercer
Update .github/workflows/pr-checks.yml
ea1e72c 
Co-authored-by: Henry Mercer <henry.mercer@me.com>
@nickfyson
remove dedundant single quotes from node version strings
6b5b958
@nickfyson
add pr check for node version consistency
7898bc2
@nickfyson @henrymercer
Apply suggestions from code review
c757f9f 
Co-authored-by: Henry Mercer <henry.mercer@me.com>
@nickfyson
Merge pull request #2006 from github/nickfyson/node-20
64e61ba 
change to node20 for all actions
@github-actions
Update changelog for v3.22.11
e2b5cc7
@nickfyson nickfyson marked this pull request as ready for review December 13, 2023 14:43
@nickfyson nickfyson requested a review from a team as a code owner December 13, 2023 14:43
@nickfyson nickfyson merged commit b374143 into releases/v3 Dec 13, 2023
358 checks passed
@nickfyson nickfyson deleted the update-v3.22.11-64e61baea branch December 13, 2023 15:19
This was referenced Dec 13, 2023
Merged
Closed
@github-actions github-actions bot mentioned this pull request Dec 18, 2023
Closed
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nickfyson nickfyson nickfyson approved these changes

Assignees

@nickfyson nickfyson

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@nickfyson @cklin