Merge main into releases/v2 #1858

github-actions · 2023-08-28T17:51:41Z

Merging 1009124 into releases/v2.

Conductor for this PR is @dbartol.

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

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

Bumps the npm group with 5 updates: | Package | From | To | | --- | --- | --- | | [@actions/cache](https://github.com/actions/toolkit/tree/HEAD/packages/cache) | `3.2.1` | `3.2.2` | | [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) | `6.2.1` | `6.4.0` | | [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) | `6.2.1` | `6.4.0` | | [eslint](https://github.com/eslint/eslint) | `8.46.0` | `8.47.0` | | [eslint-import-resolver-typescript](https://github.com/import-js/eslint-import-resolver-typescript) | `3.5.5` | `3.6.0` | Updates `@actions/cache` from 3.2.1 to 3.2.2 - [Changelog](https://github.com/actions/toolkit/blob/main/packages/cache/RELEASES.md) - [Commits](https://github.com/actions/toolkit/commits/@actions/[email protected]/packages/cache) Updates `@typescript-eslint/eslint-plugin` from 6.2.1 to 6.4.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.4.0/packages/eslint-plugin) Updates `@typescript-eslint/parser` from 6.2.1 to 6.4.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.4.0/packages/parser) Updates `eslint` from 8.46.0 to 8.47.0 - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](eslint/eslint@v8.46.0...v8.47.0) Updates `eslint-import-resolver-typescript` from 3.5.5 to 3.6.0 - [Release notes](https://github.com/import-js/eslint-import-resolver-typescript/releases) - [Changelog](https://github.com/import-js/eslint-import-resolver-typescript/blob/master/CHANGELOG.md) - [Commits](import-js/eslint-import-resolver-typescript@v3.5.5...v3.6.0) --- updated-dependencies: - dependency-name: "@actions/cache" dependency-type: direct:production update-type: version-update:semver-patch 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: eslint dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm - dependency-name: eslint-import-resolver-typescript dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm ... Signed-off-by: dependabot[bot] <[email protected]>

Now that `@actions/cache` has been updated, we can remove our manual overrides for vulnerable dependencies.

…-overrides Update `@actions/cache` and remove overrides

…ac1f11 Bump the npm group with 5 updates

If the user has manually configured it, then we let their setting stand.

Co-authored-by: Aditya Sharad <[email protected]>

Lombok: Don't set env var if it's already set

Bumps the actions-setup-swift group in /.github/actions/setup-swift with 1 update: [swift-actions/setup-swift](https://github.com/swift-actions/setup-swift). - [Release notes](https://github.com/swift-actions/setup-swift/releases) - [Commits](swift-actions/setup-swift@65540b9...cdcbe8e) --- updated-dependencies: - dependency-name: swift-actions/setup-swift dependency-type: direct:production update-type: version-update:semver-minor dependency-group: actions-setup-swift ... Signed-off-by: dependabot[bot] <[email protected]>

Bumps the npm group with 4 updates: [@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), [eslint-plugin-import](https://github.com/import-js/eslint-plugin-import) and [nock](https://github.com/nock/nock). Updates `@typescript-eslint/eslint-plugin` from 6.4.0 to 6.4.1 - [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.4.1/packages/eslint-plugin) Updates `@typescript-eslint/parser` from 6.4.0 to 6.4.1 - [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.4.1/packages/parser) Updates `eslint-plugin-import` from 2.28.0 to 2.28.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.28.0...v2.28.1) Updates `nock` from 13.3.2 to 13.3.3 - [Release notes](https://github.com/nock/nock/releases) - [Changelog](https://github.com/nock/nock/blob/main/CHANGELOG.md) - [Commits](nock/nock@v13.3.2...v13.3.3) --- updated-dependencies: - dependency-name: "@typescript-eslint/eslint-plugin" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: npm - dependency-name: "@typescript-eslint/parser" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: npm - dependency-name: eslint-plugin-import dependency-type: direct:development update-type: version-update:semver-patch dependency-group: npm - dependency-name: nock dependency-type: direct:development update-type: version-update:semver-patch dependency-group: npm ... Signed-off-by: dependabot[bot] <[email protected]>

…thub/actions/setup-swift/actions-setup-swift-487d23c2d8 Bump the actions-setup-swift group in /.github/actions/setup-swift with 1 update

…c6628f Bump the npm group with 4 updates

Update docs links in the README

…in limit Otherwise it'll be lower than the default at some point in the future.

Kotlin: CodeQL >= 2.13.4 supports 1.9.10.

Update default bundle to 2.14.3

github-actions bot and others added 30 commits August 14, 2023 14:09

Update changelog and version after v2.21.4

2760c3e

Update checked-in dependencies

96f00f2

Merge pull request #1839 from github/mergeback/v2.21.4-to-main-a09933a1

3ecf990

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

Update checked-in dependencies

6a54608

Update @actions/cache and remove overrides

4db827f

Now that `@actions/cache` has been updated, we can remove our manual overrides for vulnerable dependencies.

Merge pull request #1841 from github/henrymercer/remove-actions-cache…

314b271

…-overrides Update `@actions/cache` and remove overrides

Merge branch 'main' into dependabot/npm_and_yarn/npm-4335ac1f11

af18655

Merge pull request #1840 from github/dependabot/npm_and_yarn/npm-4335…

e683046

…ac1f11 Bump the npm group with 5 updates

Lombok: Don't set env var if it's already set

d5b5e18

If the user has manually configured it, then we let their setting stand.

npm run build

b557ee7

Add a changenote for the Lombok change

c34b59d

Tweak CHANGELOG.md

ddf2bd2

Co-authored-by: Aditya Sharad <[email protected]>

Merge pull request #1844 from github/igfoo/lombok_no_overwrite

e426271

Lombok: Don't set env var if it's already set

Update default bundle to codeql-bundle-v2.14.3

37628e7

Add changelog note

e755a05

Update README.md

66572f0

Update checked-in dependencies

02c4574

Merge pull request #1846 from github/dependabot/github_actions/dot-gi…

bc08098

…thub/actions/setup-swift/actions-setup-swift-487d23c2d8 Bump the actions-setup-swift group in /.github/actions/setup-swift with 1 update

Merge pull request #1847 from github/dependabot/npm_and_yarn/npm-522a…

14877a1

…c6628f Bump the npm group with 4 updates

Merge pull request #1 from sabrowning1/sabrowning1/update-README-links

5c8be66

Update docs links in the README

Merge branch 'github:main' into main

dfb560c

Merge pull request #1848 from sabrowning1/main

9a53fd0

Update docs links in the README

Kotlin: CodeQL >= 2.13.4 supports 1.9.10.

e581348

npm run build

30fe0c4

Kotlin: Fix lint

ff95d14

npm run build

070dd05

Add a changelog entry for the Kotlin 1.9.10 support

862b2cf

igfoo and others added 6 commits August 24, 2023 17:56

Put upper limit on the CodeQL versions for which we override the Kotl…

7dab600

…in limit Otherwise it'll be lower than the default at some point in the future.

npm run build

2f913c1

Merge pull request #1853 from github/igfoo/kot1.9.10

ff9cb43

Kotlin: CodeQL >= 2.13.4 supports 1.9.10.

Merge branch 'main' into update-bundle/codeql-bundle-v2.14.3

a2d14d3

Merge pull request #1845 from github/update-bundle/codeql-bundle-v2.14.3

1009124

Update default bundle to 2.14.3

Update changelog for v2.21.5

7323c2a

github-actions bot assigned dbartol Aug 28, 2023

dbartol marked this pull request as ready for review August 28, 2023 17:54

dbartol requested a review from a team as a code owner August 28, 2023 17:54

dbartol approved these changes Aug 28, 2023

View reviewed changes

dbartol merged commit 00e563e into releases/v2 Aug 28, 2023
363 checks passed

dbartol deleted the update-v2.21.5-100912429 branch August 28, 2023 18:35

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge main into releases/v2 #1858

Merge main into releases/v2 #1858

github-actions bot commented Aug 28, 2023 •

edited by dbartol

Loading

Merge main into releases/v2 #1858

Merge main into releases/v2 #1858

Conversation

github-actions bot commented Aug 28, 2023 • edited by dbartol Loading

github-actions bot commented Aug 28, 2023 •

edited by dbartol

Loading