Merge releases/v3 into releases/v2 #2036

github-actions · 2023-12-13T15:23:06Z

Merging b374143 into releases/v2.

Conductor for this PR is @nickfyson.

Contains the following pull requests:

~~change to node20 for all actions #2006 (@nickfyson)~~ (reverted so that v2 stays on Node 16)
Bump the actions group with 2 updates #2024 (@dependabot[bot])
Mergeback v2.22.10 refs/heads/releases/v2 into main #2029 (@cklin)
Merge main into releases/v3 #2034 (@nickfyson)

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.
- https://github.com/github/docs-content/issues/13155
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.

…node16

Mergeback v2.22.10 refs/heads/releases/v2 into main

* 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] <[email protected]> * Rebuild --------- Signed-off-by: dependabot[bot] <[email protected]> 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>

Co-authored-by: Henry Mercer <[email protected]>

change to node20 for all actions

Merge main into releases/v3

github-actions · 2023-12-13T15:31:12Z

Pushed a commit to update the checked-in dependencies. Please mark the PR as ready for review to trigger PR checks.

github-actions · 2023-12-13T18:44:20Z

Pushed a commit to rebuild the Action. Please mark the PR as ready for review to trigger PR checks.

This reverts commit d651fbc.

This reverts commit f2d0c2e.

…iled on node16" This reverts commit 5b52b36.

This reverts commit 3a9f6a8.

This reverts commit 0bc194e.

Co-authored-by: Henry Mercer <[email protected]>

github-actions · 2023-12-13T20:08:46Z

Pushed a commit to update the checked-in dependencies. Please mark the PR as ready for review to trigger PR checks.

github-actions · 2023-12-13T20:11:04Z

Pushed a commit to rebuild the Action. Please mark the PR as ready for review to trigger PR checks.

jsoref · 2024-01-25T08:19:14Z

@henrymercer could you please adjust the description?

It says:

change to node20 for all actions #2006 (@nickfyson)

But that was reverted.

henrymercer · 2024-01-25T09:50:59Z

Good call, thanks.

jsoref · 2024-01-25T15:15:47Z

Thanks. That's exactly what I and the person after me need in order to understand what's going on!

(Items in release notes or the top level readme would also help, but this is much better than nothing.)

henrymercer · 2024-01-25T15:25:47Z

We've added a section to the top of the changelog, as well as a "[v3+ only] The CodeQL Action now runs on Node.js v20" changelog note for 3.22.11. We're also looking to see whether we can use GitHub Releases to better communicate the changenotes for each release, but we need to look at how this impacts the CodeQL Bundle which is also distributed via GitHub Releases.

jsoref · 2024-01-25T23:33:24Z

At the expense of burning a commit on the default branch, I'd put a thing into https://github.com/github/codeql-action?tab=readme-ov-file#codeql-action

At least until you fix the releases tab. Making people search through all releases only to find nothing isn't great.

(I'm trying to release my own action and dealing w/ the fallout from the node v20 changes....)

henrymercer · 2024-01-26T14:11:39Z

Thanks for the suggestion, I'm happy to err on the side of over-communicating :) See #2100

nickfyson and others added 23 commits December 7, 2023 14:07

change to node20 for all actions

d651fbc

upgrade node type definitions

f2d0c2e

change to node20 for all actions

5b19bef

reintroduce PR check that confirm action can be still be compiled on …

5b52b36

…node16

update version in various hardcoded locations

cc4fead

update javascript files

3a9f6a8

fix choice of older node version to test

303dec0

Update checked-in dependencies

bf51594

add not about continuing testing on node 16

95be4b2

switch check sarif action to node20

0bc194e

Merge branch 'main' into nickfyson/node-20

1de8705

Update changelog and version after v2.22.10

691226e

Update checked-in dependencies

1bca5bf

Merge pull request #2029 from github/mergeback/v2.22.10-to-main-305f6546

3c1878d

Mergeback v2.22.10 refs/heads/releases/v2 into main

Merge branch 'main' into nickfyson/node-20

b974542

Update .github/workflows/pr-checks.yml

ea1e72c

Co-authored-by: Henry Mercer <[email protected]>

remove dedundant single quotes from node version strings

6b5b958

add pr check for node version consistency

7898bc2

Apply suggestions from code review

c757f9f

Co-authored-by: Henry Mercer <[email protected]>

Merge pull request #2006 from github/nickfyson/node-20

64e61ba

change to node20 for all actions

Update changelog for v3.22.11

e2b5cc7

Merge pull request #2034 from github/update-v3.22.11-64e61baea

b374143

Merge main into releases/v3

github-actions bot added the Update dependencies Trigger PR workflow to update dependencies label Dec 13, 2023

github-actions bot assigned nickfyson Dec 13, 2023

nickfyson marked this pull request as ready for review December 13, 2023 15:24

nickfyson requested a review from a team as a code owner December 13, 2023 15:24

github-actions bot removed the Update dependencies Trigger PR workflow to update dependencies label Dec 13, 2023

github-actions bot marked this pull request as draft December 13, 2023 15:31

github-actions bot marked this pull request as draft December 13, 2023 18:44

nickfyson marked this pull request as ready for review December 13, 2023 18:47

github-actions bot and others added 7 commits December 13, 2023 20:05

Update version and changelog for v2.22.11

e763762

Revert "change to node20 for all actions"

47334bf

This reverts commit d651fbc.

Revert "upgrade node type definitions"

231f9f1

This reverts commit f2d0c2e.

Revert "reintroduce PR check that confirm action can be still be comp…

e106171

…iled on node16" This reverts commit 5b52b36.

Revert "update javascript files"

8bc67d1

This reverts commit 3a9f6a8.

Revert "switch check sarif action to node20"

241e8b4

This reverts commit 0bc194e.

Update src/codeql.ts

c28d79b

Co-authored-by: Henry Mercer <[email protected]>

nickfyson force-pushed the backport-v2.22.11-b374143c1 branch from 7e4e289 to c28d79b Compare December 13, 2023 20:05

nickfyson added the Update dependencies Trigger PR workflow to update dependencies label Dec 13, 2023

github-actions bot removed the Update dependencies Trigger PR workflow to update dependencies label Dec 13, 2023

Update checked-in dependencies

20d1a9b

github-actions bot marked this pull request as draft December 13, 2023 20:08

nickfyson added the Rebuild Re-transpile JS & re-generate workflows label Dec 13, 2023

github-actions bot removed the Rebuild Re-transpile JS & re-generate workflows label Dec 13, 2023

Rebuild

54f1007

nickfyson marked this pull request as ready for review December 13, 2023 20:11

henrymercer approved these changes Dec 13, 2023

View reviewed changes

nickfyson merged commit 03e7845 into releases/v2 Dec 13, 2023
357 checks passed

nickfyson deleted the backport-v2.22.11-b374143c1 branch December 13, 2023 20:40

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge releases/v3 into releases/v2 #2036

Merge releases/v3 into releases/v2 #2036

github-actions bot commented Dec 13, 2023 •

edited by henrymercer

Loading

github-actions bot commented Dec 13, 2023

github-actions bot commented Dec 13, 2023

github-actions bot commented Dec 13, 2023

github-actions bot commented Dec 13, 2023

jsoref commented Jan 25, 2024

henrymercer commented Jan 25, 2024

jsoref commented Jan 25, 2024

henrymercer commented Jan 25, 2024

jsoref commented Jan 25, 2024

henrymercer commented Jan 26, 2024

Merge releases/v3 into releases/v2 #2036

Merge releases/v3 into releases/v2 #2036

Conversation

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

github-actions bot commented Dec 13, 2023

github-actions bot commented Dec 13, 2023

github-actions bot commented Dec 13, 2023

github-actions bot commented Dec 13, 2023

jsoref commented Jan 25, 2024

henrymercer commented Jan 25, 2024

jsoref commented Jan 25, 2024

henrymercer commented Jan 25, 2024

jsoref commented Jan 25, 2024

henrymercer commented Jan 26, 2024

github-actions bot commented Dec 13, 2023 •

edited by henrymercer

Loading