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

fix(dev/tools): fail make dev/tools step if installing go deps returned error (backport of #11703) #11707

Merged
merged 3 commits into from
Oct 8, 2024

Conversation

kumahq[bot]
Copy link
Contributor

@kumahq kumahq bot commented Oct 8, 2024

Automatic cherry-pick of #11703 for branch release-2.6

Generated by action

cherry-picked commit 4b3c0cd
⚠️ ⚠️ ⚠️ Conflicts happened when cherry-picking! ⚠️ ⚠️ ⚠️

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

You are currently cherry-picking commit 4b3c0cd0e.
  (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:   mk/dependencies/go-deps.sh

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

…ed error (#11703)

* fix(ci): fail make dev/tools step if installing go deps returned error

Signed-off-by: Marcin Skalski <[email protected]>

---------

Signed-off-by: Marcin Skalski <[email protected]>
@kumahq kumahq bot requested a review from a team as a code owner October 8, 2024 09:25
@kumahq kumahq bot requested review from jijiechen and Icarus9913 and removed request for a team October 8, 2024 09:25
@Automaat Automaat closed this Oct 8, 2024
@Automaat Automaat reopened this Oct 8, 2024
@Automaat Automaat added the ci/skip-test PR: Don't run unit and e2e tests (maybe this is just a doc change) label Oct 8, 2024
Signed-off-by: Marcin Skalski <[email protected]>
@Automaat Automaat removed the conflict label Oct 8, 2024
Signed-off-by: Marcin Skalski <[email protected]>
@Automaat Automaat enabled auto-merge (squash) October 8, 2024 09:42
@Automaat Automaat merged commit 093144c into release-2.6 Oct 8, 2024
10 checks passed
@Automaat Automaat deleted the chore/backport-release-2.6-11703 branch October 8, 2024 09:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci/skip-test PR: Don't run unit and e2e tests (maybe this is just a doc change) release-2.6
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant