Merge releases/v3 into releases/v2 by github-actions[bot] · Pull Request #2647 · github/codeql-action · GitHub

Merging 8a93837 into releases/v2.

Conductor for this PR is @marcogario.

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:
- node_modules/.package-lock.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.

…reaming

…ng with proxy

Co-authored-by: Henry Mercer <henrymercer@github.com>

This commit makes deepenGitHistory pass "origin HEAD" to Git fetch, which prevents Git from fetching all branches that are present in the remote repository.

This commits adds a "git repack" step to getPullRequestEditedDiffRanges to work around a Git bug concerning tracking of grafted commits.

…ep for the container

…e extraction

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

…ng-tweak Improve Git subgraph fetching for diff-informed queries

Extract git-utils.ts

…extraction

…en_streaming Respect proxy settings when streaming the download and extraction of the CodeQL bundle

…_post Start Proxy: Make the post step more robust to errors

We need to do this because using a default token will not recursively trigger a new workflow run.

…ease Use an app token for triggering a release

Merge main into releases/v3

This reverts commit 983979f.

This reverts commit 352556d.

….8-8a93837af # Conflicts: # node_modules/.package-lock.json

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

Copilot reviewed 230 out of 245 changed files in this pull request and generated no suggestions.

Files not reviewed (15)

.github/workflows/__test-proxy.yml: Evaluated as low risk
.github/workflows/post-release-mergeback.yml: Evaluated as low risk
CHANGELOG.md: Evaluated as low risk
lib/actions-util.js: Evaluated as low risk
lib/actions-util.test.js: Evaluated as low risk
lib/analyze-action-env.test.js: Evaluated as low risk
lib/analyze-action-input.test.js: Evaluated as low risk
lib/analyze.js: Evaluated as low risk
lib/codeql.js: Evaluated as low risk
lib/database-upload.js: Evaluated as low risk
lib/database-upload.test.js: Evaluated as low risk
lib/git-utils.js: Evaluated as low risk
lib/git-utils.test.js: Evaluated as low risk
lib/logging.js: Evaluated as low risk
lib/setup-codeql.js: Evaluated as low risk

Comments skipped due to low confidence (1)

lib/start-proxy-action-post.js:58

The 'core' parameter should be replaced with 'logger' to match the updated function signature.

const config = await configUtils.getConfig(actionsUtil.getTemporaryDirectory(), core);

Tip: Copilot code review supports C#, Go, Java, JavaScript, Markdown, Python, Ruby and TypeScript, with more languages coming soon. Learn more

NlightNFotis and others added 30 commits December 4, 2024 19:29

feat: use http agent that respects environment proxy settings when st…

0dc76a9

…reaming

build: add undici to node_modules folder - CI fails without it

8f2cb3a

ci: add configuration tto run proxy with zstd package to test streami…

78be2f1

…ng with proxy

ci: add capability to handle container initialisation steps to sync.py

9c48c8b

ci: remove patch file and cleanup justfile

b4bc093

chore: add changelog entry

b706e37

chore: reword description in CHANGELOG.md

182c5e7

Co-authored-by: Henry Mercer <henrymercer@github.com>

docs: add readme for justfile/pr-checks update

a89fbc8

ci: remove dns for container running proxy steps (experimental)

c901aee

Introduce withGroupAsync()

70aac4e

deepenGitHistory: specify HEAD

dd4aa40

This commit makes deepenGitHistory pass "origin HEAD" to Git fetch, which prevents Git from fetching all branches that are present in the remote repository.

deepenGitHistory: do not fetch submodules

3e10d34

getPullRequestEditedDiffRanges: work around fatal error

57a2859

This commits adds a "git repack" step to getPullRequestEditedDiffRanges to work around a Git bug concerning tracking of grafted commits.

build: refresh js files

f9b0c1f

Merge branch 'main' into NlightNFotis/detect_use_proxy_when_streaming

3951a82

docs: add documentation for the reason why we need to have a setup st…

51e71f8

…ep for the container

feat: cleanup destination directory if we fail during streaming of th…

4c20d4f

…e extraction

Update changelog and version after v3.27.7

9fd5c24

Update checked-in dependencies

18cf30d

Merge pull request #2641 from github/mergeback/v3.27.7-to-main-babb554e

417bb84

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

Merge pull request #2638 from github/cklin/diff-informed-graph-fetchi…

dfed55c

…ng-tweak Improve Git subgraph fetching for diff-informed queries

Move Git functions to git-utils.ts

b0cd76b

Create git-utils.test.ts for git-utils.ts

b2c41ec

build: refresh js files

300d251

Merge branch 'main' into NlightNFotis/detect_use_proxy_when_streaming

c6454d5

Merge pull request #2639 from github/cklin/extract-git-utils

4d64ab6

Extract git-utils.ts

Update PR checks readme instructions

9323695

feat: change wording of error reporting when a failure occurs during …

88bcf64

…extraction

fix: move changelog entry to appropriate place

9e8cd42

Merge branch 'main' into NlightNFotis/detect_use_proxy_when_streaming

1e5b591

marcogario and others added 13 commits December 11, 2024 13:41

Avoid failing the workflow on a proxy post step

f327a84

Add token information

849b60e

formatting

47dd68e

Merge pull request #2624 from github/NlightNFotis/detect_use_proxy_wh…

c4bbe15

…en_streaming Respect proxy settings when streaming the download and extraction of the CodeQL bundle

Merge pull request #2643 from github/marcogario/robustify_start_proxy…

78d0136

…_post Start Proxy: Make the post step more robust to errors

Use an app token for triggering a release

9a8645d

We need to do this because using a default token will not recursively trigger a new workflow run.

Merge pull request #2644 from github/aeisenberg/use-app-token-for-rel…

9cfbef4

…ease Use an app token for triggering a release

Update changelog for v3.27.8

90a2700

Merge pull request #2645 from github/update-v3.27.8-9cfbef4bd

8a93837

Merge main into releases/v3

Revert "Update version and changelog for v2.27.7"

536cee0

This reverts commit 983979f.

Revert "Update checked-in dependencies"

7431e79

This reverts commit 352556d.

Merge remote-tracking branch 'origin/releases/v3' into backport-v2.27…

6999d05

….8-8a93837af # Conflicts: # node_modules/.package-lock.json

Update version and changelog for v2.27.8

c35c430

github-actions Bot added the Update dependencies Trigger PR workflow to update dependencies label Dec 12, 2024

github-actions Bot assigned marcogario Dec 12, 2024

marcogario added Update dependencies Trigger PR workflow to update dependencies and removed Update dependencies Trigger PR workflow to update dependencies labels Dec 12, 2024

github-actions Bot removed the Update dependencies Trigger PR workflow to update dependencies label Dec 12, 2024

Update checked-in dependencies

6fd4fd2

marcogario marked this pull request as ready for review December 12, 2024 20:52

Copilot AI review requested due to automatic review settings December 12, 2024 20:52

marcogario requested a review from a team as a code owner December 12, 2024 20:52

Copilot AI reviewed Dec 12, 2024

View reviewed changes

marcogario approved these changes Dec 12, 2024

View reviewed changes

marcogario enabled auto-merge December 12, 2024 21:04

marcogario merged commit 949c156 into releases/v2 Dec 12, 2024

marcogario deleted the backport-v2.27.8-8a93837af branch December 12, 2024 21:04

Merge releases/v3 into releases/v2 by github-actions[bot] · Pull Request #2647 · github/codeql-action · GitHub

Merge releases/v3 into releases/v2 - #2647

Merge releases/v3 into releases/v2#2647
marcogario merged 44 commits into
releases/v2from
backport-v2.27.8-8a93837af

github-actions Bot commented Dec 12, 2024 •
edited by marcogario
Loading

Uh oh!

Uh oh!

github-actions Bot commented Dec 12, 2024

Uh oh!

Copilot AI left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Merge releases/v3 into releases/v2 by github-actions[bot] · Pull Request #2647 · github/codeql-action · GitHub

Merge releases/v3 into releases/v2 - #2647

Merge releases/v3 into releases/v2#2647marcogario merged 44 commits intoreleases/v2github/codeql-action:releases/v2from backport-v2.27.8-8a93837afgithub/codeql-action:backport-v2.27.8-8a93837afCopy head branch name to clipboard

Conversation

github-actions Bot commented Dec 12, 2024 • edited by marcogario Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot commented Dec 12, 2024

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Merge releases/v3 into releases/v2#2647
marcogario merged 44 commits into
releases/v2from
backport-v2.27.8-8a93837af

github-actions Bot commented Dec 12, 2024 •
edited by marcogario
Loading