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

chore(deps): bump go from 1.20.7 to 1.21.1 (backport of #7799) #7826

Merged
merged 2 commits into from
Sep 25, 2023

Conversation

kumahq[bot]
Copy link
Contributor

@kumahq kumahq bot commented Sep 25, 2023

Automatic cherry-pick of #7799 for branch release-2.4

Generated by action

cherry-picked commit 630cd8b
⚠️ ⚠️ ⚠️ Conflicts happened when cherry-picking! ⚠️ ⚠️ ⚠️

On branch release-2.4
Your branch is up to date with 'origin/release-2.4'.

You are currently cherry-picking commit 630cd8bee.
  (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:   .circleci/config.yml
	modified:   .github/workflows/blackbox-tests.yaml
	modified:   .github/workflows/golangci-lint.yml
	modified:   .github/workflows/helm-release.yaml
	modified:   .github/workflows/pr-comments.yaml
	modified:   .github/workflows/release.yaml
	modified:   .github/workflows/update-docs.yaml
	modified:   .github/workflows/update-insecure-dependencies.yaml
	modified:   go.mod

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.sum
	both modified:   mk/dependencies/deps.lock
	both modified:   mk/dev.mk

@kumahq kumahq bot requested a review from a team as a code owner September 25, 2023 07:35
@kumahq kumahq bot requested review from michaelbeaumont and lukidzi and removed request for a team September 25, 2023 07:35
Signed-off-by: Lukasz Dziedziak <[email protected]>
@lukidzi lukidzi merged commit 0ed54d0 into release-2.4 Sep 25, 2023
@lukidzi lukidzi deleted the chore/backport-release-2.4-7799 branch September 25, 2023 09:06
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