Merge releases/v3 into releases/v2 #2069

henrymercer · 2024-01-08T13:04:51Z

Merging e5f05b8 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.
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.

Stop testing `stable-20220908` bundle as this is no longer supported.

Co-authored-by: Andrew Eisenberg <[email protected]>

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

* Bump the npm group with 2 updates Bumps the npm group with 2 updates: [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) and [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser). Updates `@typescript-eslint/eslint-plugin` from 6.14.0 to 6.15.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.15.0/packages/eslint-plugin) Updates `@typescript-eslint/parser` from 6.14.0 to 6.15.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.15.0/packages/parser) --- updated-dependencies: - 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 ... Signed-off-by: dependabot[bot] <[email protected]> * Update checked-in dependencies --------- 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>

* 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]> * Bump `setup-python` and `setup-go` to v5 --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Angela P Wen <[email protected]>

Bumps the actions group with 1 update: [actions/setup-go](https://github.com/actions/setup-go). 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-go dependency-type: direct:production update-type: version-update:semver-major dependency-group: actions ... Signed-off-by: dependabot[bot] <[email protected]>

…eb420c Bump the npm group with 2 updates

…s-970b8d0e10 Bump the actions group with 1 update

Remove support for CodeQL v2.11.5 and earlier

Python: Don't install deps by default for all users

…eries-repo Remove unused test example code

…-parsing Remove config parsing logic that is now implemented in the CLI

… by the CLI

…cleanup Clean up running queries some more

Merge main into releases/v3

This reverts commit 9c74de2.

This reverts commit d6286c6.

….0-e5f05b81d

github-actions · 2024-01-08T13:06:51Z

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

henrymercer · 2024-01-08T13:11:22Z

I have manually created this PR since the automated release process failed with a permissions error: https://github.com/github/codeql-action/actions/runs/7447206065/job/20259107256

github-actions · 2024-01-08T13:12:19Z

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

nickfyson · 2024-01-08T13:24:32Z

pr-checks/sync.py

@@ -76,12 +74,11 @@ def writeHeader(checkStream):
    steps = [
        {
            'name': 'Setup Python on MacOS',
-            'uses': 'actions/setup-python@v4',
+            'uses': 'actions/setup-python@v5',


Do we want to update this for our version that's maintaining compatibility with node 16?

(and same in other places that changes his action version...)

Great question. I think since it's only affecting PR checks, and since the only difference between v4 and v5 of the setup-python Action is the node version, I'm happy updating this to reduce the potential for conflicts between v2 and v3.

github-actions bot and others added 30 commits November 16, 2023 00:11

Update supported GitHub Enterprise Server versions

6111b7c

Bump the minor version number of the Action

c7f4ea5

Bump minimum CodeQL version to 2.11.6

d1166e6

Update PR checks

6491452

Stop testing `stable-20220908` bundle as this is no longer supported.

Remove CodeQL version guards for 2.11.5 and earlier

a36fc67

Remove result pruning for CodeQL 2.11.2

fdea2a5

Add changelog note

0240eaf

Hyperlink corresponding changelog entry

5dc8134

Python: Don't install deps by default for all users

2f93dd4

Update changelog

1e69962

Did create feature-flag

84a9fc4

Add missing logic to force enable lib extraction

bc36e6c

prettier

a13f4b8

build

1e69b89

Safer wording of CHANGELOG entry

77f4e07

Co-authored-by: Andrew Eisenberg <[email protected]>

Merge branch 'main' into rasmuswl/no-dep-inst-default

dd20793

Update changelog and version after v3.22.12

ad5035b

Update checked-in dependencies

710aa2d

Merge pull request #2053 from github/mergeback/v3.22.12-to-main-012739e5

6f5223d

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

Update checked-in dependencies

01e47d0

Update PR check source

fb410e7

Merge pull request #2057 from github/dependabot/npm_and_yarn/npm-1688…

ee9b8ab

…eb420c Bump the npm group with 2 updates

Merge branch 'main' into henrymercer/drop-codeql-v2.11.5

35b10b5

Merge pull request #2058 from github/dependabot/github_actions/action…

e345646

…s-970b8d0e10 Bump the actions group with 1 update

Merge branch 'main' into update-supported-enterprise-server-versions

6ebbf45

Merge pull request #2009 from github/henrymercer/drop-codeql-v2.11.5

7963a60

Remove support for CodeQL v2.11.5 and earlier

RasmusWL and others added 13 commits January 5, 2024 10:23

Create helper isPythonDependencyInstallationDisabled

2e27b3c

Generate JS

9926570

Merge pull request #2031 from github/rasmuswl/no-dep-inst-default

58ff74a

Python: Don't install deps by default for all users

Merge pull request #2063 from github/henrymercer/remove-ml-powered-qu…

08ae9bf

…eries-repo Remove unused test example code

Merge branch 'main' into henrymercer/remove-action-config-parsing

a533ec6

Merge pull request #2062 from github/henrymercer/remove-action-config…

8516954

…-parsing Remove config parsing logic that is now implemented in the CLI

Clean up running queries workflow now that the queries are determined…

838a022

… by the CLI

Merge pull request #2065 from github/henrymercer/further-run-queries-…

fd55bb0

…cleanup Clean up running queries some more

Update changelog for v3.23.0

48e7b8b

Merge pull request #2066 from github/update-v3.23.0-fd55bb0b0

e5f05b8

Merge main into releases/v3

Revert "Update version and changelog for v2.22.12"

997d889

This reverts commit 9c74de2.

Revert "Update checked-in dependencies"

99d337a

This reverts commit d6286c6.

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

8f5ae1a

….0-e5f05b81d

henrymercer added the Update dependencies Trigger PR workflow to update dependencies label Jan 8, 2024

henrymercer self-assigned this Jan 8, 2024

Update version and changelog for v2.23.0

8f2682a

github-actions bot removed the Update dependencies Trigger PR workflow to update dependencies label Jan 8, 2024

henrymercer force-pushed the backport-v2.23.0-e5f05b81d branch from edf716a to 8f2682a Compare January 8, 2024 13:09

henrymercer added the Update dependencies Trigger PR workflow to update dependencies label Jan 8, 2024

github-actions bot removed the Update dependencies Trigger PR workflow to update dependencies label Jan 8, 2024

Update checked-in dependencies

e24bd8f

henrymercer marked this pull request as ready for review January 8, 2024 13:12

henrymercer requested a review from a team as a code owner January 8, 2024 13:12

nickfyson reviewed Jan 8, 2024

View reviewed changes

nickfyson approved these changes Jan 8, 2024

View reviewed changes

henrymercer merged commit 8b7fcbf into releases/v2 Jan 8, 2024
336 checks passed

henrymercer deleted the backport-v2.23.0-e5f05b81d branch January 8, 2024 13:43

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge releases/v3 into releases/v2 #2069

Merge releases/v3 into releases/v2 #2069

henrymercer commented Jan 8, 2024

github-actions bot commented Jan 8, 2024

henrymercer commented Jan 8, 2024

github-actions bot commented Jan 8, 2024

nickfyson Jan 8, 2024

nickfyson Jan 8, 2024

henrymercer Jan 8, 2024

Merge releases/v3 into releases/v2 #2069

Merge releases/v3 into releases/v2 #2069

Conversation

henrymercer commented Jan 8, 2024

github-actions bot commented Jan 8, 2024

henrymercer commented Jan 8, 2024

github-actions bot commented Jan 8, 2024

nickfyson Jan 8, 2024

Choose a reason for hiding this comment

nickfyson Jan 8, 2024

Choose a reason for hiding this comment

henrymercer Jan 8, 2024

Choose a reason for hiding this comment