Merge main into releases/v3 #2131

github-actions · 2024-02-13T14:06:14Z

Merging c79c360 into releases/v3.

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/v3 branch.
Ensure the docs team is aware of any documentation changes that need to be released.
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.
Merge the mergeback PR that will automatically be created once this PR is merged.
Merge all backport PRs to older release branches, that will automatically be created once this PR is merged.

These tests do not depend on the CodeQL version.

This avoids uploading debug artifacts, which takes a while.

Mergeback v3.24.0 refs/heads/releases/v3 into main

…-jobs Only run custom checkout path tests against a single CodeQL version

* 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] <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>

…necessary-with-build-mode Allow omitting the autobuild Action when build mode specified

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.

Update default bundle to 2.16.2

Change `sendStatusReport` to `void`

Treat status reports as non-critical

* 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] <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>

jsoref · 2024-02-13T14:08:57Z

A bunch of my PRs are assigned to the people who merged them. It feels like the automation hasn't contemplated that PRs would be written by people who can't/won't be the people who will click the "merge" button.

intrigus-lgtm · 2024-02-13T21:04:47Z

A bunch of my PRs are assigned to the people who merged them. It feels like the automation hasn't contemplated that PRs would be written by people who can't/won't be the people who will click the "merge" button.

This is intentional:

codeql-action/.github/update-release-branch.py

Lines 163 to 168 in bc64d12

    
           # Get the person who merged the pull request. 
        
           # For most cases this will be the same as the author, but for PRs opened 
        
           # by external contributors getting the merger will get us the GitHub 
        
           # employee who reviewed and merged the PR. 
        
           def get_merger_of_pr(repo, pr): 
        
             return repo.get_commit(pr.merge_commit_sha).author.login

More interesting is that this approach seems to break when enabling auto-merge as can be seen here:
(merged by @angelapwen but PR is from @jsoref)

#2110 (@jsoref)

github-actions bot and others added 25 commits February 2, 2024 18:31

Update changelog and version after v3.24.0

921adb6

Update checked-in dependencies

da89f3f

Only run custom checkout_path tests against a single CodeQL version

1d4866b

These tests do not depend on the CodeQL version.

Disable debug mode in checkout path tests

e1fa6dd

This avoids uploading debug artifacts, which takes a while.

Merge pull request #2114 from github/mergeback/v3.24.0-to-main-e8893c57

15b447d

Mergeback v3.24.0 refs/heads/releases/v3 into main

Merge pull request #2116 from github/henrymercer/reduce-checkout-path…

39cc02b

…-jobs Only run custom checkout path tests against a single CodeQL version

Extract separate function for warnIfGoInstalledAfterInit

db6e5ff

Extract language appropriately in analyze step when build mode specified

0fe34bd

Don't run autobuild in analyze if already ran in autobuild

8fb654e

Test omitting autobuild Action when build mode specified

0ab8e2a

Document action.inputs.token (#2110)

9e39a05

Remove stray trailing spaces (#2122)

932a7d5

Add PR checks for other build modes

f3ced61

Merge pull request #2120 from github/henrymercer/no-autobuild-action-…

fc9f9e5

…necessary-with-build-mode Allow omitting the autobuild Action when build mode specified

Update default bundle to codeql-bundle-v2.16.2

8fae32e

Add changelog note

9a734da

Stop running debug artifacts checks on MacOS (#2123)

3ab1d29

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

b0346e4

Merge pull request #2124 from github/update-bundle/codeql-bundle-v2.16.2

43a8916

Update default bundle to 2.16.2

Treat status reports as non-critical

5a6da1d

Change `sendStatusReport` to `void`

Merge pull request #2121 from jsoref/status-reports-are-not-critical

4075abf

Treat status reports as non-critical

Update changelog for v3.24.1

41154da

github-actions bot assigned dbartol Feb 13, 2024

dbartol marked this pull request as ready for review February 13, 2024 14:08

dbartol requested a review from a team as a code owner February 13, 2024 14:08

dbartol approved these changes Feb 13, 2024

View reviewed changes

dbartol enabled auto-merge February 13, 2024 14:13

dbartol merged commit e675ced into releases/v3 Feb 13, 2024
315 checks passed

dbartol deleted the update-v3.24.1-c79c360e0 branch February 13, 2024 14:29

henrymercer mentioned this pull request Feb 13, 2024

Merge releases/v3 into releases/v2 #2133

Merged

13 tasks

This was referenced Feb 13, 2024

Assigning PRs to merger doesn't work when they're auto-merged #2137

Open

Add backticks around branch in update-release-branch PR template #2138

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge main into releases/v3 #2131

Merge main into releases/v3 #2131

github-actions bot commented Feb 13, 2024 •

edited by dbartol

jsoref commented Feb 13, 2024 •

edited

intrigus-lgtm commented Feb 13, 2024

Merge main into releases/v3 #2131

Merge main into releases/v3 #2131

Conversation

github-actions bot commented Feb 13, 2024 • edited by dbartol

jsoref commented Feb 13, 2024 • edited

intrigus-lgtm commented Feb 13, 2024

github-actions bot commented Feb 13, 2024 •

edited by dbartol

jsoref commented Feb 13, 2024 •

edited