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

Merged
merged 31 commits into from
Feb 13, 2024
Merged

Merge releases/v3 into releases/v2 #2133

merged 31 commits into from
Feb 13, 2024

Conversation

henrymercer
Copy link
Contributor

@henrymercer henrymercer commented Feb 13, 2024 •
edited by dbartol
Loading

Merging e675ced into releases/v2.

Conductor for this PR is @dbartol.

Contains the following pull requests:

Please do the following:

  • Ensure package.json file contains the correct version.
  • Add commits to this branch to resolve the merge conflicts in the following files:
    • package-lock.json
    • package.json
  • Ensure another maintainer has reviewed the additional commits you added to this branch to resolve the merge conflicts.
  • 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 28 commits February 2, 2024 18:31
@github-actions
Update changelog and version after v3.24.0
921adb6
@github-actions
Update checked-in dependencies
da89f3f
@henrymercer
Only run custom checkout_path tests against a single CodeQL version
1d4866b 
These tests do not depend on the CodeQL version.
@henrymercer
Disable debug mode in checkout path tests
e1fa6dd 
This avoids uploading debug artifacts, which takes a while.
@henrymercer
Merge pull request #2114 from github/mergeback/v3.24.0-to-main-e8893c57
15b447d 
Mergeback v3.24.0 refs/heads/releases/v3 into main
@henrymercer
Merge pull request #2116 from github/henrymercer/reduce-checkout-path…
39cc02b 
…-jobs

 Only run custom checkout path tests against a single CodeQL version
@dependabot @github-actions
Bump the npm group with 2 updates (#2118)
cf7e9f2 
* Bump the npm group with 2 updates

Bumps the npm group with 2 updates: [@actions/cache](https://github.com/actions/toolkit/tree/HEAD/packages/cache) and [semver](https://github.com/npm/node-semver).


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

Updates `semver` from 7.5.4 to 7.6.0
- [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.5.4...v7.6.0)

---
updated-dependencies:
- dependency-name: "@actions/cache"
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: npm
- dependency-name: semver
  dependency-type: direct:production
  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>
@henrymercer
Extract separate function for warnIfGoInstalledAfterInit
db6e5ff
@henrymercer
Extract language appropriately in analyze step when build mode specified
0fe34bd
@henrymercer
Don't run autobuild in analyze if already ran in autobuild
8fb654e
@henrymercer
Test omitting autobuild Action when build mode specified
0ab8e2a
@jsoref
Document action.inputs.token (#2110)
9e39a05
@jsoref
Remove stray trailing spaces (#2122)
932a7d5
@henrymercer
Add PR checks for other build modes
f3ced61
@henrymercer
Merge pull request #2120 from github/henrymercer/no-autobuild-action-…
fc9f9e5 
…necessary-with-build-mode

Allow omitting the autobuild Action when build mode specified
@angelapwen
Refactor configuration errors (#2105)
1515e2b 
Refactor the existing classes of configuration errors into their own file; consolidate the place we check for configuration errors into `codeql.ts`, where the actual command invocations happen.

Also, rename the `UserError` type to `ConfigurationError` to standardize on a single term.
@github-actions
Update default bundle to codeql-bundle-v2.16.2
8fae32e
@github-actions
Add changelog note
9a734da
@angelapwen
Stop running debug artifacts checks on MacOS (#2123)
3ab1d29
@dbartol
Merge branch 'main' into update-bundle/codeql-bundle-v2.16.2
b0346e4
@dbartol
Merge pull request #2124 from github/update-bundle/codeql-bundle-v2.16.2
43a8916 
Update default bundle to 2.16.2
@jsoref
Treat status reports as non-critical
5a6da1d 
Change `sendStatusReport` to `void`
@aeisenberg
Merge pull request #2121 from jsoref/status-reports-are-not-critical
4075abf 
Treat status reports as non-critical
@dependabot @github-actions
Bump the npm group with 3 updates (#2128)
c79c360 
* Bump the npm group with 3 updates

Bumps the npm group with 3 updates: [@types/semver](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/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 `@types/semver` from 7.5.6 to 7.5.7
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/semver)

Updates `@typescript-eslint/eslint-plugin` from 6.20.0 to 6.21.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.21.0/packages/eslint-plugin)

Updates `@typescript-eslint/parser` from 6.20.0 to 6.21.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.21.0/packages/parser)

---
updated-dependencies:
- dependency-name: "@types/semver"
  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-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>
@github-actions
Update changelog for v3.24.1
41154da
@dbartol
Merge pull request #2131 from github/update-v3.24.1-c79c360e0
e675ced 
Merge main into releases/v3
@henrymercer
Revert "Update version and changelog for v2.24.0"
4504810 
This reverts commit 3ed798e.
@henrymercer
Revert "Update checked-in dependencies"
f5c8be0 
This reverts commit f822fa3.
@henrymercer henrymercer added the Update dependencies Trigger PR workflow to update dependencies label Feb 13, 2024
@github-actions github-actions bot removed the Update dependencies Trigger PR workflow to update dependencies label Feb 13, 2024
@github-actions GitHub Actions
Copy link
Contributor

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 February 13, 2024 15:28
@dbartol dbartol requested a review from a team as a code owner February 13, 2024 15:28
dbartol
dbartol previously approved these changes Feb 13, 2024
View reviewed changes
@henrymercer
Copy link
Contributor Author

henrymercer commented Feb 13, 2024 •
edited
Loading

Inadvertently checked in the release script change I used to perform the release manually. Force pushed to address.

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

Merge conflicts in package.json resolved manually, package-lock.json conflicts should be solved by Update dependencies workflow.

@github-actions github-actions bot removed the Update dependencies Trigger PR workflow to update dependencies label Feb 13, 2024
@github-actions GitHub Actions
Copy link
Contributor

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 February 13, 2024 15:32
auto-merge was automatically disabled February 13, 2024 15:32

Pull request was converted to draft

@henrymercer henrymercer marked this pull request as ready for review February 13, 2024 15:32
@dbartol dbartol merged commit 1a077f8 into releases/v2 Feb 13, 2024
315 checks passed
@dbartol dbartol deleted the backport-v2.24.1-e675ced7a branch February 13, 2024 15:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dbartol dbartol dbartol approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

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