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.

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

Merge releases/v3 into releases/v2 #2647

Merged
merged 44 commits into from
Dec 12, 2024
Merged

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Dec 12, 2024

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.

NlightNFotis and others added 30 commits December 4, 2024 19:29
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.
Mergeback v3.27.7 refs/heads/releases/v3 into main
…ng-tweak

Improve Git subgraph fetching for diff-informed queries
marcogario and others added 13 commits December 11, 2024 13:41
…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
….8-8a93837af

# Conflicts:
#	node_modules/.package-lock.json
@github-actions github-actions bot added the Update dependencies Trigger PR workflow to update dependencies label Dec 12, 2024
@marcogario 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 github-actions bot removed the Update dependencies Trigger PR workflow to update dependencies label Dec 12, 2024
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.

@marcogario marcogario marked this pull request as ready for review December 12, 2024 20:52
@Copilot Copilot bot review requested due to automatic review settings December 12, 2024 20:52
@marcogario marcogario requested a review from a team as a code owner December 12, 2024 20:52

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@marcogario marcogario enabled auto-merge December 12, 2024 21:04
@marcogario marcogario merged commit 949c156 into releases/v2 Dec 12, 2024
260 checks passed
@marcogario marcogario deleted the backport-v2.27.8-8a93837af branch December 12, 2024 21:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants