Skip to content

Merge releases/v3 into releases/v2 #2302

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
Merged
merged 37 commits into from
May 20, 2024
Merged

Merge releases/v3 into releases/v2 #2302

merged 37 commits into from
May 20, 2024

Conversation

@github-actions
Copy link
Contributor

@github-actions github-actions bot commented May 20, 2024 •
edited by dbartol
Loading

Merging 9fdb3e4 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.
  • 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.
NlightNFotis and others added 30 commits May 10, 2024 16:57
@NlightNFotis
Add documentation for the tools option in the various workflow files
6182f33
@NlightNFotis @henrymercer
Clarify wording
eb4969f 
Co-authored-by: Henry Mercer <henrymercer@github.com>
@NlightNFotis
Improve wording on internal workflows and add clarification for tools…
4f59156 
… input in the description.
@koesie10
Enable database uploads for GHEC-DR
bc3670a
@koesie10
Update tests for GHEC-DR
90e315a
@github-actions
Update changelog and version after v3.25.5
9f6ef11
@github-actions
Update checked-in dependencies
32f554e
@henrymercer
Merge pull request #2288 from github/mergeback/v3.25.5-to-main-b7cec752
bf2faab 
Mergeback v3.25.5 refs/heads/releases/v3 into main
@NlightNFotis
Add option tools: linked for init action.
cbe408d 
Also ensure that option latest remains compatible, and add tests for
the two options.
@NlightNFotis
Add logging for CodeQL CLI Version and add tests to the logger for it.
cff15d7
@NlightNFotis
Add test for CodeQL version appearing in log.
c92bbd4
@NlightNFotis
Change overriding log message to make default version more explicit.
998a4c7
@NlightNFotis
[SYNC] Sync files in lib/ as requested by CI check that is failing
4522b08
@NlightNFotis
Add new input option tools: linked to CHANGELOG
1796f54
@NlightNFotis
Move logging messages to downstream function and add deprecation notice
bcc1365
@NlightNFotis
Soften deprecation message wording and remove unhelpful version strin…
df4819e 
…gs from some locations
@NlightNFotis
Merge pull request #2281 from github/tools_latest_improvement
5a14b05 
Add option `tools: linked` for `tools` input of init action.
@NlightNFotis
Merge pull request #2284 from github/NlightNFotis/add_tools_help
08487db 
Add documentation for the `tools` option in the various workflow files
@koesie10
Fix trailing slash on uploads URL
24766fc
@koesie10
Remove feature flag for combine SARIF files deprecation warning
931fabe
@koesie10
Merge pull request #2292 from github/koesie10/remove-combine-sarif-fi…
7fd4900 
…les-deprecation-warning-ff

Remove feature flag for combine SARIF files deprecation warning
@henrymercer
Update docs for build-mode: autobuild
9f32769 
The `autobuild` Action is no longer needed or recommended.
@dependabot
Bump the npm group across 1 directory with 4 updates
3b42294 
Bumps the npm group with 4 updates in the / directory: [@octokit/types](https://github.com/octokit/types.ts), [semver](https://github.com/npm/node-semver), [@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 `@octokit/types` from 13.4.1 to 13.5.0
- [Release notes](https://github.com/octokit/types.ts/releases)
- [Commits](octokit/types.ts@v13.4.1...v13.5.0)

Updates `semver` from 7.6.0 to 7.6.2
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/main/CHANGELOG.md)
- [Commits](npm/node-semver@v7.6.0...v7.6.2)

Updates `@typescript-eslint/eslint-plugin` from 7.8.0 to 7.9.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/v7.9.0/packages/eslint-plugin)

Updates `@typescript-eslint/parser` from 7.8.0 to 7.9.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/v7.9.0/packages/parser)

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

Signed-off-by: dependabot[bot] <support@github.com>
@github-actions
Update checked-in dependencies
e54dea2
@henrymercer
Merge pull request #2294 from github/dependabot/npm_and_yarn/npm-d328…
b7ef64e 
…5d5234

Bump the npm group across 1 directory with 4 updates
@koesie10
Merge pull request #2286 from github/koesie10/ghec-dr-db-upload
a57c67b 
Enable database uploads for GHEC-DR
@github-actions
Update default bundle to codeql-bundle-v2.17.3
de1ac31
@github-actions
Add changelog note
e9e2729
@henrymercer
Merge pull request #2293 from github/henrymercer/update-build-mode-au…
0d9161c 
…tobuild-docs

Update docs for `build-mode: autobuild`
Merge pull request #2295 from github/update-bundle/codeql-bundle-v2.17.3
63d519c 
Update default bundle to 2.17.3
@github-actions github-actions bot added the Update dependencies Trigger PR workflow to update dependencies label May 20, 2024
@dbartol dbartol added Update dependencies Trigger PR workflow to update dependencies and removed Update dependencies Trigger PR workflow to update dependencies labels May 20, 2024
@github-actions github-actions bot removed the Update dependencies Trigger PR workflow to update dependencies label May 20, 2024
@github-actions
Copy link
Contributor Author

github-actions bot commented May 20, 2024

Pushed a commit to update the checked-in dependencies. Please mark the PR as ready for review to trigger PR checks.
@dbartol dbartol marked this pull request as ready for review May 20, 2024 14:40
@dbartol dbartol requested a review from a team as a code owner May 20, 2024 14:40
@dbartol
Copy link

dbartol commented May 20, 2024

Force merging to work around GLIBC removal from recent ubuntu-latest images. Full fix will be propagated as part of the next release cycle.
@dbartol dbartol merged commit 162eb1e into releases/v2 May 20, 2024
@dbartol dbartol deleted the backport-v2.25.6-9fdb3e497 branch May 20, 2024 15:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

5 participants

@dbartol @NlightNFotis @koesie10 @henrymercer