Merge releases/v3 into releases/v2 by github-actions[bot] · Pull Request #2054 · github/codeql-action · GitHub

Merging 012739e into releases/v2.

Conductor for this PR is @adityasharad.

Contains the following pull requests:

Please do the following:

Ensure package.json file contains the correct version.
Add commits to this branch to resolve the merge conflicts in the following files:
- CONTRIBUTING.md
Ensure another maintainer has reviewed the additional commits you added to this branch to resolve the merge conflicts.
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.
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.

Bumps the npm group with 4 updates: [@octokit/types](https://github.com/octokit/types.ts), [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin), [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) and [typescript](https://github.com/Microsoft/TypeScript). Updates `@octokit/types` from 12.3.0 to 12.4.0 - [Release notes](https://github.com/octokit/types.ts/releases) - [Commits](octokit/types.ts@v12.3.0...v12.4.0) Updates `@typescript-eslint/eslint-plugin` from 6.13.2 to 6.14.0 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.14.0/packages/eslint-plugin) Updates `@typescript-eslint/parser` from 6.13.2 to 6.14.0 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.14.0/packages/parser) Updates `typescript` from 5.3.2 to 5.3.3 - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Commits](microsoft/TypeScript@v5.3.2...v5.3.3) --- updated-dependencies: - dependency-name: "@octokit/types" dependency-type: direct:production update-type: version-update:semver-minor dependency-group: npm - dependency-name: "@typescript-eslint/eslint-plugin" dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm - dependency-name: "@typescript-eslint/parser" dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm - dependency-name: typescript dependency-type: direct:development update-type: version-update:semver-patch dependency-group: npm ... Signed-off-by: dependabot[bot] <support@github.com>

Mergeback v3.22.11 refs/heads/releases/v3 into main

…872b3d Bump the npm group with 4 updates

Co-authored-by: Henry Mercer <henry.mercer@me.com>

…ions

* Bump the npm group with 2 updates Bumps the npm group with 2 updates: [eslint](https://github.com/eslint/eslint) and [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import). Updates `eslint` from 8.55.0 to 8.56.0 - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](eslint/eslint@v8.55.0...v8.56.0) Updates `eslint-plugin-import` from 2.29.0 to 2.29.1 - [Release notes](https://github.com/import-js/eslint-plugin-import/releases) - [Changelog](https://github.com/import-js/eslint-plugin-import/blob/main/CHANGELOG.md) - [Commits](import-js/eslint-plugin-import@v2.29.0...v2.29.1) --- updated-dependencies: - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm - dependency-name: eslint-plugin-import dependency-type: direct:development update-type: version-update:semver-patch dependency-group: npm ... Signed-off-by: dependabot[bot] <support@github.com> * Update checked-in dependencies --------- 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>

improve handling of changelog processing for backports

Update default bundle to 2.15.5

Fix type error in `Update release branch` workflow

Merge main into releases/v3

This reverts commit e763762.

This reverts commit 20d1a9b.

….12-012739e50 # Conflicts: # CONTRIBUTING.md

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

Looks like this merge conflict still needs to be addressed!

Urgh. Pushed to my fork instead of upstream. Fixed now.

TIL about .ini file types 🤯

dependabot Bot and others added 30 commits December 13, 2023 11:05

Update checked-in dependencies

0d8f348

Merge branch 'main' into dependabot/npm_and_yarn/npm-0a98872b3d

95591ba

Update changelog and version after v3.22.11

2b2fb6b

Update checked-in dependencies

7813bda

Merge pull request #2035 from github/mergeback/v3.22.11-to-main-b374143c

ebf5a83

Mergeback v3.22.11 refs/heads/releases/v3 into main

Merge pull request #2033 from github/dependabot/npm_and_yarn/npm-0a98…

511f073

…872b3d Bump the npm group with 4 updates

improve handling of changelog processing for backports

8e4a6c7

change version numbers inside processing function as well

e0c2b0a

Apply suggestions from code review

ee53012

Co-authored-by: Henry Mercer <henry.mercer@me.com>

rename regex for clarity

fda1796

preserve trailing whitespace when transforming CHANGELOG

0724061

raise explicit exception if EOF found when looking for changelog sect…

8e086df

…ions

add note on versioning approach to changelog

cda785e

Merge pull request #2041 from github/nickfyson/fix-changelog-backports

0978396

improve handling of changelog processing for backports

clarify comment on versions in the changelog

8478e2a

clarify comment on versions in the changelog

2603673

Merge pull request #2044 from github/nickfyson/update-changelog

7e187e1

Update default bundle to codeql-bundle-v2.15.5

fe1e55f

Add changelog note

a99bd84

Merge pull request #2047 from github/update-bundle/codeql-bundle-v2.15.5

a110746

Update default bundle to 2.15.5

update required checks script to handle release branches

a42c9a2

add note about backporting check changes to v2 branch

9ed5fc7

Merge pull request #2050 from github/nickfyson/add-releases-ini

49812ec

Fix type error

658e3c6

Typecast OLDEST_SUPPORTED_MAJOR_VERSION when defined

0be9290

Merge pull request #2051 from github/angelapwen/patch-release-script

40cb08c

Fix type error in `Update release branch` workflow

Update changelog for v3.22.12

c1cf794

Merge pull request #2052 from github/update-v3.22.12-40cb08c12

012739e

Merge main into releases/v3

github-actions Bot added 4 commits December 22, 2023 00:47

Revert "Update version and changelog for v2.22.11"

844fc3c

This reverts commit e763762.

Revert "Update checked-in dependencies"

3366e3b

This reverts commit 20d1a9b.

Merge remote-tracking branch 'origin/releases/v3' into backport-v2.22…

49a6ae4

….12-012739e50 # Conflicts: # CONTRIBUTING.md

Update version and changelog for v2.22.12

9c74de2

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

github-actions Bot assigned adityasharad Dec 22, 2023

adityasharad added Update dependencies Trigger PR workflow to update dependencies and removed Update dependencies Trigger PR workflow to update dependencies labels Dec 22, 2023

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

Update checked-in dependencies

d6286c6

adityasharad marked this pull request as ready for review December 22, 2023 04:01

adityasharad requested a review from a team as a code owner December 22, 2023 04:01

angelapwen reviewed Dec 22, 2023

View reviewed changes

Resolve conflicts in v3->v2.22.12 merge

0d318c9

angelapwen approved these changes Dec 22, 2023

View reviewed changes

angelapwen enabled auto-merge December 22, 2023 16:39

angelapwen merged commit 1500a13 into releases/v2 Dec 22, 2023

angelapwen deleted the backport-v2.22.12-012739e50 branch December 22, 2023 16:39

+              <<<<<<< HEAD
 . Make a PR to bump the `OLDEST_SUPPORTED_MAJOR_VERSION` in [release-branches.py](.github/actions/release-branches/release-branches.py).  Once this PR is merged, the release process will no longer backport changes to the deprecated release version.
+              =======
+. Make a PR to bump the `OLDEST_SUPPORTED_MAJOR_VERSION` in [releases.ini](.github/releases.ini).  Once this PR is merged, the release process will no longer backport changes to the deprecated release version.
+              >>>>>>> origin/releases/v3

 . Wait for the deprecation period to pass.
 . Upgrade the Actions warning for customers using the deprecated version to a non-fatal error, and mention that this version of the Action is no longer supported.
-. Make a PR to bump the `OLDEST_SUPPORTED_MAJOR_VERSION` in [release-branches.py](.github/actions/release-branches/release-branches.py).  Once this PR is merged, the release process will no longer backport changes to the deprecated release version.
+. Make a PR to bump the `OLDEST_SUPPORTED_MAJOR_VERSION` in [releases.ini](.github/releases.ini).  Once this PR is merged, the release process will no longer backport changes to the deprecated release version.

Merge releases/v3 into releases/v2 by github-actions[bot] · Pull Request #2054 · github/codeql-action · GitHub

Uh oh!

Merge releases/v3 into releases/v2 - #2054

Merge releases/v3 into releases/v2#2054
angelapwen merged 36 commits into
releases/v2from
backport-v2.22.12-012739e50

github-actions Bot commented Dec 22, 2023 •
edited by angelapwen
Loading

Uh oh!

Uh oh!

github-actions Bot commented Dec 22, 2023

Uh oh!

angelapwen Dec 22, 2023

Uh oh!

adityasharad Dec 22, 2023

Uh oh!

angelapwen Dec 22, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Merge releases/v3 into releases/v2 by github-actions[bot] · Pull Request #2054 · github/codeql-action · GitHub

Uh oh!

Merge releases/v3 into releases/v2 - #2054

Merge releases/v3 into releases/v2#2054angelapwen merged 36 commits intoreleases/v2github/codeql-action:releases/v2from backport-v2.22.12-012739e50github/codeql-action:backport-v2.22.12-012739e50Copy head branch name to clipboard

Conversation

github-actions Bot commented Dec 22, 2023 • edited by angelapwen Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot commented Dec 22, 2023

Uh oh!

angelapwen Dec 22, 2023

Choose a reason for hiding this comment

Uh oh!

adityasharad Dec 22, 2023

Choose a reason for hiding this comment

Uh oh!

angelapwen Dec 22, 2023

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Merge releases/v3 into releases/v2#2054
angelapwen merged 36 commits into
releases/v2from
backport-v2.22.12-012739e50

github-actions Bot commented Dec 22, 2023 •
edited by angelapwen
Loading