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 #2091

Merged
merged 37 commits into from
Jan 17, 2024
Merged

Merge releases/v3 into releases/v2 #2091

merged 37 commits into from
Jan 17, 2024

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Jan 17, 2024 •
edited by alexet
Loading

Merging 0b21cf2 into releases/v2.

Conductor for this PR is @alexet.

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 January 8, 2024 12:11
@github-actions
Update changelog and version after v3.23.0
f674cff
@github-actions
Update checked-in dependencies
bb812eb
@henrymercer
Merge pull request #2067 from github/mergeback/v3.23.0-to-main-e5f05b81
e2d3904 
Mergeback v3.23.0 refs/heads/releases/v3 into main
@henrymercer
Remove code specific to GitHub AE
415881f
@dependabot
Bump the npm group with 2 updates
ab07ded 
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.17.0 to 6.18.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.18.0/packages/eslint-plugin)

Updates `@typescript-eslint/parser` from 6.17.0 to 6.18.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.18.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]>
@github-actions
Update checked-in dependencies
bff178d
@dependabot
Bump the actions-setup-swift group
e26ddc0 
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).


Updates `swift-actions/setup-swift` from 1.25.0 to 1.26.0
- [Release notes](https://github.com/swift-actions/setup-swift/releases)
- [Commits](swift-actions/setup-swift@f51889e...cdbe0f7)

---
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]>
@henrymercer
Merge pull request #2070 from github/henrymercer/remove-ghae
e6a47e2 
Remove code specific to GitHub AE
@github-actions
Update default bundle to codeql-bundle-v2.16.0
72e5036
@github-actions
Add changelog note
8e8de28
@aeisenberg
Merge pull request #2072 from github/dependabot/github_actions/dot-gi…
6693d13 
…thub/actions/setup-swift/actions-setup-swift-71a5d23140

Bump the actions-setup-swift group in /.github/actions/setup-swift with 1 update
@aeisenberg
Merge pull request #2071 from github/dependabot/npm_and_yarn/npm-61af…
3516b7f 
…ffbee9

Bump the npm group with 2 updates
@angelapwen
Remove Node 16 deprecation note (#2076)
b8e349d
@aeisenberg
Dependabot alerts for shield only
0395410
@aeisenberg
Merge pull request #2077 from github/aeisenberg/dependabot-shield
6d223f9 
Dependabot alerts for shield only
@dependabot
Bump the npm group with 3 updates
ccdb046 
Bumps the npm group with 3 updates: [@types/sinon](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/sinon), [@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 `@types/sinon` from 17.0.2 to 17.0.3
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/sinon)

Updates `@typescript-eslint/eslint-plugin` from 6.18.0 to 6.18.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.18.1/packages/eslint-plugin)

Updates `@typescript-eslint/parser` from 6.18.0 to 6.18.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.18.1/packages/parser)

---
updated-dependencies:
- dependency-name: "@types/sinon"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: npm
- 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
...

Signed-off-by: dependabot[bot] <[email protected]>
@github-actions
Update checked-in dependencies
6e49652
@aeisenberg
Merge pull request #2078 from github/dependabot/npm_and_yarn/npm-261f…
3b54300 
…9f0017

Bump the npm group with 3 updates
@aeisenberg
Add a retention period of 7 days
f5a8218 
For debug artifacts. Ensures they don't stick around
too long since these can be large.
@aeisenberg
Merge pull request #2079 from github/aeisenberg/artifact-storage
cd94990 
Add a retention period of 7 days
@henrymercer
Fix paths/paths-ignore warning that would appear unconditionally
94e6891
@henrymercer
Handle empty lists as well as undefined ones
30597e3
@henrymercer
Merge pull request #2080 from github/henrymercer/fix-unconditional-wa…
eb14aeb 
…rning

Fix `paths`/`paths-ignore` warning that would appear unconditionally
@angelapwen
Stop setting CODEQL_RUNNER environment variable if CLI already sets…
9653106 
… it (#2081)

* Check `setsCodeqlRunnerEnvVar` is set in the CLI with `ToolsFeatures`

* Stop setting `CODEQL_RUNNER` env var when CLI does

* Add optional `features` parameter in test utils

* Test that `CODEQL_RUNNER` is not set if CLI sets it
@alexet
Merge branch 'main' into update-bundle/codeql-bundle-v2.16.0
1fea7a5
@dependabot
Bump the npm group with 4 updates
e292db6 
Bumps the npm group with 4 updates: [@actions/cache](https://github.com/actions/toolkit/tree/HEAD/packages/cache), [@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 [nock](https://github.com/nock/nock).


Updates `@actions/cache` from 3.2.2 to 3.2.3
- [Changelog](https://github.com/actions/toolkit/blob/main/packages/cache/RELEASES.md)
- [Commits](https://github.com/actions/toolkit/commits/HEAD/packages/cache)

Updates `@typescript-eslint/eslint-plugin` from 6.18.1 to 6.19.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.19.0/packages/eslint-plugin)

Updates `@typescript-eslint/parser` from 6.18.1 to 6.19.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.19.0/packages/parser)

Updates `nock` from 13.4.0 to 13.5.0
- [Release notes](https://github.com/nock/nock/releases)
- [Changelog](https://github.com/nock/nock/blob/main/CHANGELOG.md)
- [Commits](nock/nock@v13.4.0...v13.5.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: nock
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: npm
...

Signed-off-by: dependabot[bot] <[email protected]>
@github-actions
Update checked-in dependencies
6b12e3d
@kaeluka
Merge pull request #2086 from github/dependabot/npm_and_yarn/npm-c044…
e65c5d9 
…1c84d9

Bump the npm group with 4 updates
@alexet
Merge pull request #2073 from github/update-bundle/codeql-bundle-v2.16.0
4d75a10 
Update default bundle to 2.16.0
@angelapwen
Only delete SARIF in PR check if not running on a fork (#2084)
f65ecd0
@github-actions github-actions bot added the Update dependencies Trigger PR workflow to update dependencies label Jan 17, 2024
@alexet alexet marked this pull request as ready for review January 17, 2024 16:49
@alexet alexet requested a review from a team as a code owner January 17, 2024 16:49
alexet
alexet previously approved these changes Jan 17, 2024
View reviewed changes
@alexet alexet enabled auto-merge January 17, 2024 16:51
@github-actions github-actions bot removed the Update dependencies Trigger PR workflow to update dependencies label Jan 17, 2024
@github-actions GitHub Actions
Copy link
Contributor Author

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

@github-actions github-actions bot marked this pull request as draft January 17, 2024 16:52
auto-merge was automatically disabled January 17, 2024 16:52

Pull request was converted to draft

@alexet alexet marked this pull request as ready for review January 17, 2024 17:09
@alexet alexet enabled auto-merge January 17, 2024 17:11
auto-merge was automatically disabled January 17, 2024 17:15

Pull Request is not mergeable

@henrymercer
Copy link
Contributor

I'll re-enable auto-merge, not sure why it was disabled.

@henrymercer henrymercer merged commit 4759df8 into releases/v2 Jan 17, 2024
337 checks passed
@henrymercer henrymercer deleted the backport-v2.23.1-0b21cf249 branch January 17, 2024 17:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alexet alexet alexet approved these changes

Assignees

@alexet alexet

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@henrymercer @alexet @aeisenberg @angelapwen @kaeluka