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 releases/v3 into releases/v2 #2069

Merged
merged 60 commits into from
Jan 8, 2024
Merged

Merge releases/v3 into releases/v2 #2069

merged 60 commits into from
Jan 8, 2024

Conversation

henrymercer
Copy link
Contributor

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.

github-actions bot and others added 30 commits November 16, 2023 00:11
@github-actions
Update supported GitHub Enterprise Server versions
6111b7c
@henrymercer
Bump the minor version number of the Action
c7f4ea5
@henrymercer
Bump minimum CodeQL version to 2.11.6
d1166e6
@henrymercer
Update PR checks
6491452 
Stop testing `stable-20220908` bundle as this is no longer supported.
@henrymercer
Remove CodeQL version guards for 2.11.5 and earlier
a36fc67
@henrymercer
Remove result pruning for CodeQL 2.11.2
fdea2a5
@henrymercer
Add changelog note
0240eaf
@henrymercer
Hyperlink corresponding changelog entry
5dc8134
@RasmusWL
Python: Don't install deps by default for all users
2f93dd4
@RasmusWL
Update changelog
1e69962
@RasmusWL
Did create feature-flag
84a9fc4
@RasmusWL
Add missing logic to force enable lib extraction
bc36e6c
@RasmusWL
prettier
a13f4b8
@RasmusWL
build
1e69b89
@RasmusWL @aeisenberg
Safer wording of CHANGELOG entry
77f4e07 
Co-authored-by: Andrew Eisenberg <aeisenberg@github.com>
@RasmusWL
Merge branch 'main' into rasmuswl/no-dep-inst-default
dd20793
@github-actions
Update changelog and version after v3.22.12
ad5035b
@github-actions
Update checked-in dependencies
710aa2d
@adityasharad
Merge pull request #2053 from github/mergeback/v3.22.12-to-main-012739e5
6f5223d 
Mergeback v3.22.12 refs/heads/releases/v3 into main
@dependabot @github-actions
Bump the npm group with 2 updates (#2055)
e01299b 
* 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] <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>
@dependabot @angelapwen
Bump the actions group with 2 updates (#2056)
596b173 
* 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>

* Bump `setup-python` and `setup-go` to v5

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Angela P Wen <angelapwen@github.com>
@dependabot
Bump the npm group with 2 updates
ecbf80a 
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.15.0 to 6.17.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.17.0/packages/eslint-plugin)

Updates `@typescript-eslint/parser` from 6.15.0 to 6.17.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.17.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] <support@github.com>
@github-actions
Update checked-in dependencies
01e47d0
@dependabot
Bump the actions group with 1 update
fab3a43 
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] <support@github.com>
@henrymercer
Update PR check source
fb410e7
@henrymercer
Merge pull request #2057 from github/dependabot/npm_and_yarn/npm-1688…
ee9b8ab 
…eb420c

Bump the npm group with 2 updates
@henrymercer
Merge branch 'main' into henrymercer/drop-codeql-v2.11.5
35b10b5
@henrymercer
Merge pull request #2058 from github/dependabot/github_actions/action…
e345646 
…s-970b8d0e10

Bump the actions group with 1 update
@henrymercer
Merge branch 'main' into update-supported-enterprise-server-versions
6ebbf45
@henrymercer
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
@RasmusWL
Create helper isPythonDependencyInstallationDisabled
2e27b3c
@RasmusWL
Generate JS
9926570
@RasmusWL
Merge pull request #2031 from github/rasmuswl/no-dep-inst-default
58ff74a 
Python: Don't install deps by default for all users
@henrymercer
Merge pull request #2063 from github/henrymercer/remove-ml-powered-qu…
08ae9bf 
…eries-repo

Remove unused test example code
@henrymercer
Merge branch 'main' into henrymercer/remove-action-config-parsing
a533ec6
@henrymercer
Merge pull request #2062 from github/henrymercer/remove-action-config…
8516954 
…-parsing

Remove config parsing logic that is now implemented in the CLI
@henrymercer
Clean up running queries workflow now that the queries are determined…
838a022 
… by the CLI
@henrymercer
Merge pull request #2065 from github/henrymercer/further-run-queries-…
fd55bb0 
…cleanup

Clean up running queries some more
@github-actions
Update changelog for v3.23.0
48e7b8b
@henrymercer
Merge pull request #2066 from github/update-v3.23.0-fd55bb0b0
e5f05b8 
Merge main into releases/v3
@henrymercer
Revert "Update version and changelog for v2.22.12"
997d889 
This reverts commit 9c74de2.
@henrymercer
Revert "Update checked-in dependencies"
99d337a 
This reverts commit d6286c6.
@henrymercer
Merge remote-tracking branch 'origin/releases/v3' into backport-v2.23…
8f5ae1a 
….0-e5f05b81d
@henrymercer henrymercer added the Update dependencies Trigger PR workflow to update dependencies label Jan 8, 2024
@henrymercer henrymercer self-assigned this Jan 8, 2024
@github-actions github-actions bot removed the Update dependencies Trigger PR workflow to update dependencies label Jan 8, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jan 8, 2024

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

@henrymercer henrymercer added the Update dependencies Trigger PR workflow to update dependencies label Jan 8, 2024
@henrymercer
Copy link
Contributor Author

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 github-actions bot removed the Update dependencies Trigger PR workflow to update dependencies label Jan 8, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jan 8, 2024

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

@henrymercer henrymercer marked this pull request as ready for review January 8, 2024 13:12
@henrymercer henrymercer requested a review from a team as a code owner January 8, 2024 13:12
nickfyson
nickfyson reviewed Jan 8, 2024
View reviewed changes
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',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

@henrymercer henrymercer merged commit 8b7fcbf into releases/v2 Jan 8, 2024
336 checks passed
@henrymercer henrymercer deleted the backport-v2.23.0-e5f05b81d branch January 8, 2024 13:43
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

@henrymercer henrymercer

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@henrymercer @nickfyson @RasmusWL @adityasharad