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): update go from 1.20.5 to 1.20.6 (backport of #7414) #7419

Merged
merged 1 commit into from
Aug 2, 2023

Conversation

kumahq[bot]
Copy link
Contributor

@kumahq kumahq bot commented Aug 2, 2023

Automatic cherry-pick of #7414 for branch release-2.3

Generated by action

cherry-picked commit d75a50f
⚠️ ⚠️ ⚠️ Conflicts happened when cherry-picking! ⚠️ ⚠️ ⚠️

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

You are currently cherry-picking commit d75a50fd5.
  (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/pr-comments.yaml
	modified:   .github/workflows/release.yaml
	modified:   .github/workflows/update-insecure-dependencies.yaml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .github/workflows/golangci-lint.yml
	deleted by us:   .github/workflows/update-docs.yaml
	both modified:   go.mod
	both modified:   go.sum
	both modified:   mk/dependencies/deps.lock
	both modified:   mk/dev.mk

* chore(deps): bump golang from 1.20.5 to 1.20.6

Signed-off-by: Charly Molter <charly.molter@konghq.com>

* chore(deps): update to testcontainers main

Signed-off-by: slonka <slonka@users.noreply.github.com>

* chore: update dependencies.lock

Signed-off-by: Bart Smykla <bartek@smykla.com>

---------

Signed-off-by: Charly Molter <charly.molter@konghq.com>
Signed-off-by: Krzysztof Słonka <slonka@users.noreply.github.com>
Signed-off-by: slonka <slonka@users.noreply.github.com>
Signed-off-by: Bart Smykla <bartek@smykla.com>
Co-authored-by: Charly Molter <charly.molter@konghq.com>
Co-authored-by: Bart Smykla <bartek@smykla.com>
@michaelbeaumont michaelbeaumont force-pushed the chore/backport-release-2.3-7414 branch from 8b307d8 to 51a41e6 Compare August 2, 2023 16:29
@michaelbeaumont michaelbeaumont merged commit eb13a8f into release-2.3 Aug 2, 2023
@michaelbeaumont michaelbeaumont deleted the chore/backport-release-2.3-7414 branch August 2, 2023 17:42
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