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

build(deps)!: bump ICS to v6.3.0 (backport #3395) #3397

Merged
merged 2 commits into from
Oct 18, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 18, 2024

Description

Closes: #XXXX

Note that the change is not state breaking. See here the changes between ICS v6.2.0 and v6.2.2.


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
  • Targeted the correct branch (see PR Targeting)
  • Provided a link to the relevant issue 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 all author checklist items have been addressed
  • Confirmed that this PR does not change production code

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

* bump ICS to v6.2.1

* bump ICS to v6.2.2

* bump ICS to v6.3.0-rc0

* update changelog entries

* fix UTs

* bump ICS to v6.3.0

(cherry picked from commit 210618b)

# Conflicts:
#	.changelog/v21.0.0/dependencies/3385-bump-ics.md
#	.changelog/v21.0.0/dependencies/3395-bump-ics.md
#	.changelog/v21.0.0/state-breaking/3385-bump-ics.md
#	.changelog/v21.0.0/state-breaking/3395-bump-ics.md
@mergify mergify bot requested a review from zmanian as a code owner October 18, 2024 15:32
@mergify mergify bot added the conflicts label Oct 18, 2024
@mergify mergify bot assigned mpoke Oct 18, 2024
Copy link
Contributor Author

mergify bot commented Oct 18, 2024

Cherry-pick of 210618b has failed:

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

You are currently cherry-picking commit 210618b.
  (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:   app/upgrades/v20/upgrades_test.go
	modified:   go.mod
	modified:   go.sum

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by them: .changelog/v21.0.0/dependencies/3385-bump-ics.md
	added by them:   .changelog/v21.0.0/dependencies/3395-bump-ics.md
	deleted by them: .changelog/v21.0.0/state-breaking/3385-bump-ics.md
	added by them:   .changelog/v21.0.0/state-breaking/3395-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

@mpoke mpoke merged commit 48ce059 into release/v21.x Oct 18, 2024
17 checks passed
@mpoke mpoke deleted the mergify/bp/release/v21.x/pr-3395 branch October 18, 2024 16:46
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.

2 participants