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/v2 into releases/v1 #1377

Merged
merged 55 commits into from
Nov 16, 2022
Merged

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Nov 16, 2022

Merging 678fc3a into releases/v1

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:
    • 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/v1 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.

henrymercer and others added 30 commits November 11, 2022 18:00
We now only need to support doing this in the CLI.
Mergeback v2.1.32 refs/heads/releases/v2 into main
This is now covered by `codescanning-config-cli.yml`.
These are covered by `codeql.yml`, which runs across all latest runner
images.
These are tested by `multi-language-autodetect.yml`
These are covered by `autobuild-action.yml`.
Testing SARIF compatibility is covered by `codeql.yml`.
We don't need to test runner functionality now since the runner is only
used in PR checks, and `extractor-ram-threads.yml` covers the Action
case.
We could move everything into `util`, but in some ways it is nice having
a file dedicated to Actions related utilities.
…CTOR_GO_BUILD_TRACING` for custom builds (#1322)

Co-authored-by: Henry Mercer <[email protected]>
henrymercer and others added 12 commits November 15, 2022 21:19
Given that the GITHUB_REF is a protected variable, we want to prefer it to
CODE_SCANNING_REF. This should prevent accidentally overwriting these values.
The logic is a bit more involved, as I think it makes sense to raise the error
about GITHUB_REF not being set, rather than mentioning CODE_SCANNING_REF if
both are not set.
Bump minimum CodeQL bundle version to 2.6.3
…-678fc3af

# Conflicts:
#	package-lock.json
@github-actions github-actions bot added the Update dependencies Trigger PR workflow to update dependencies label Nov 16, 2022
@marcogario marcogario added Update dependencies Trigger PR workflow to update dependencies and removed Update dependencies Trigger PR workflow to update dependencies labels Nov 16, 2022
@github-actions github-actions bot removed the Update dependencies Trigger PR workflow to update dependencies label Nov 16, 2022
@marcogario marcogario marked this pull request as ready for review November 16, 2022 19:32
@marcogario marcogario requested a review from a team as a code owner November 16, 2022 19:32
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.

4 participants