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 main into releases/v2 #1655

Merged
merged 28 commits into from Apr 21, 2023
Merged

Merge main into releases/v2 #1655

merged 28 commits into from Apr 21, 2023

Conversation

github-actions[bot]
Copy link
Contributor

Merging a8affb0 into releases/v2.

Conductor for this PR is @cklin.

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/v2 branch.
  • Ensure the docs team is aware of any documentation changes that need to be released.
  • 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.

henrymercer and others added 28 commits March 28, 2023 17:24
Mergeback v2.2.12 refs/heads/releases/v2 into main
This PR switches the update-bundle release trigger from `prereleased` to `published` because the former has been documented not to work.

From https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#release:

> Note: The prereleased type will not trigger for pre-releases published from draft releases, but the published type will trigger. If you want a workflow to run when stable and pre-releases publish, subscribe to published instead of released and prereleased.
Fix pre-release trigger for update-bundle action
Bumps [swift-actions/setup-swift](https://github.com/swift-actions/setup-swift) from 1.22.0 to 1.23.0.
- [Release notes](https://github.com/swift-actions/setup-swift/releases)
- [Commits](swift-actions/setup-swift@da0e3e0...65540b9)

---
updated-dependencies:
- dependency-name: swift-actions/setup-swift
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
It's the whole tag, we don't want to remove the `codeql-bundle-` prefix.
Fix the `bundleVersion` field set by the automated bundle update PR
Update default CodeQL bundle version to 2.13.0
@cklin cklin marked this pull request as ready for review April 21, 2023 18:38
@cklin cklin requested a review from a team as a code owner April 21, 2023 18:38
@cklin cklin enabled auto-merge April 21, 2023 18:42
@cklin cklin merged commit b2c19fb into releases/v2 Apr 21, 2023
345 checks passed
@cklin cklin deleted the update-v2.3.0-a8affb063 branch April 21, 2023 19:07
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.

None yet

2 participants