Skip to content

build-machinery-go: bump to the latest version#299

Merged
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
jmencak:4.10-build-machinery-go
Dec 13, 2021
Merged

build-machinery-go: bump to the latest version#299
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
jmencak:4.10-build-machinery-go

Conversation

@jmencak
Copy link
Copy Markdown
Contributor

@jmencak jmencak commented Dec 13, 2021

The current version of build-machinery-go fixes the problems with
yaml-patch missing github repository.

The current version of build-machinery-go fixes the problems with
yaml-patch missing github repository.
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Dec 13, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jmencak

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 13, 2021
@dagrayvid
Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Dec 13, 2021
@jmencak
Copy link
Copy Markdown
Contributor Author

jmencak commented Dec 13, 2021

/retest

@openshift-bot
Copy link
Copy Markdown
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

2 similar comments
@openshift-bot
Copy link
Copy Markdown
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Copy Markdown
Contributor

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Dec 13, 2021

@jmencak: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@openshift-cherrypick-robot
Copy link
Copy Markdown

@jmencak: #299 failed to apply on top of branch "release-4.9":

Applying: build-machinery-go: bump to the latest version
Using index info to reconstruct a base tree...
M	go.mod
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Auto-merging go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 build-machinery-go: bump to the latest version
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

Details

In response to this:

/cherry-pick release-4.9

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

IlyaTyomkin pushed a commit to IlyaTyomkin/cluster-node-tuning-operator that referenced this pull request May 23, 2023
The current version of build-machinery-go fixes the problems with
yaml-patch missing github repository.

Co-authored-by: Jiri Mencak <jmencak@users.noreply.github.com>
IlyaTyomkin pushed a commit to IlyaTyomkin/cluster-node-tuning-operator that referenced this pull request Jun 13, 2023
The current version of build-machinery-go fixes the problems with
yaml-patch missing github repository.

Co-authored-by: Jiri Mencak <jmencak@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants