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

feat!: bump ICS to v6.1.0 (backport #3350) #3354

Merged
merged 4 commits into from
Sep 20, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 20, 2024

Description

Closes: #XXXX


Author Checklist

All items are required. Please add a note to the item if the item is not applicable and
please add links to any relevant follow up issues.

I have...

  • Included the correct type prefix in the PR title
  • Added ! to the type prefix if API, client, or state breaking change (i.e., requires minor or major version bump)
  • Targeted the correct branch (see PR Targeting)
  • Provided a link to the relevant issue or specification
  • Followed the guidelines for building SDK modules
  • Included the necessary unit and integration tests
  • Added a changelog entry in .changelog (for details, see contributing guidelines)
  • Included comments for documenting Go code
  • Updated the relevant documentation or specification
  • Reviewed "Files changed" and left comments if necessary
  • Confirmed all CI checks have passed

Reviewers Checklist

All items are required. Please add a note if the item is not applicable and please add
your handle next to the items reviewed if you only reviewed selected items.

I have...

  • confirmed the correct type prefix in the PR title
  • confirmed ! in the type prefix if API or client breaking change
  • confirmed all author checklist items have been addressed
  • reviewed state machine logic
  • reviewed API design and naming
  • reviewed documentation is accurate
  • reviewed tests and test coverage

This is an automatic backport of pull request #3350 done by [Mergify](https://mergify.com).

* add ICS with patch

* go mod tidy

* bump ICS

* bump ICS

* bump ICS to v6.1.0-rc0

* update changelog entries

* bump ICS to v6.1.0

(cherry picked from commit 3ce3c5b)

# Conflicts:
#	.changelog/unreleased/features/3335-bump-ics.md
#	.changelog/v20.0.0/api-breaking/3335-bump-ics.md
#	.changelog/v20.0.0/api-breaking/3350-bump-ics.md
#	.changelog/v20.0.0/dependencies/3335-bump-ics.md
#	.changelog/v20.0.0/dependencies/3350-bump-ics.md
#	.changelog/v20.0.0/features/3335-bump-ics.md
#	.changelog/v20.0.0/features/3350-bump-ics.md
#	.changelog/v20.0.0/state-breaking/3335-bump-ics.md
#	.changelog/v20.0.0/state-breaking/3350-bump-ics.md
@mergify mergify bot requested a review from zmanian as a code owner September 20, 2024 17:14
@mergify mergify bot added the conflicts label Sep 20, 2024
@mergify mergify bot requested review from crodriguezvega, jackzampolin and a team as code owners September 20, 2024 17:14
Copy link
Contributor Author

mergify bot commented Sep 20, 2024

Cherry-pick of 3ce3c5b has failed:

On branch mergify/bp/release/v20.x/pr-3350
Your branch is up to date with 'origin/release/v20.x'.

You are currently cherry-picking commit 3ce3c5b.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   go.mod
	modified:   go.sum

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both deleted:    .changelog/unreleased/features/3335-bump-ics.md
	deleted by them: .changelog/v20.0.0/api-breaking/3335-bump-ics.md
	added by them:   .changelog/v20.0.0/api-breaking/3350-bump-ics.md
	deleted by them: .changelog/v20.0.0/dependencies/3335-bump-ics.md
	added by them:   .changelog/v20.0.0/dependencies/3350-bump-ics.md
	added by us:     .changelog/v20.0.0/features/3335-bump-ics.md
	added by them:   .changelog/v20.0.0/features/3350-bump-ics.md
	deleted by them: .changelog/v20.0.0/state-breaking/3335-bump-ics.md
	added by them:   .changelog/v20.0.0/state-breaking/3350-bump-ics.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot assigned mpoke Sep 20, 2024
@mpoke mpoke merged commit 2dba9d4 into release/v20.x Sep 20, 2024
15 checks passed
@mpoke mpoke deleted the mergify/bp/release/v20.x/pr-3350 branch September 20, 2024 17:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant