Skip to content

[release-v1.16] Fix build script#694

Merged
Kaustubh-pande merged 1 commit intoopenshift-knative:release-v1.16from
dsimansk:pr/fix-build-script
May 6, 2025
Merged

[release-v1.16] Fix build script#694
Kaustubh-pande merged 1 commit intoopenshift-knative:release-v1.16from
dsimansk:pr/fix-build-script

Conversation

@dsimansk
Copy link

@dsimansk dsimansk commented May 6, 2025

No description provided.

@openshift-ci openshift-ci bot requested review from alanfx and matzew May 6, 2025 13:25
@openshift-ci openshift-ci bot added the approved label May 6, 2025
@Kaustubh-pande
Copy link

/lgtm

@openshift-ci
Copy link

openshift-ci bot commented May 6, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dsimansk, Kaustubh-pande

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:
  • OWNERS [Kaustubh-pande,dsimansk]

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

@Kaustubh-pande Kaustubh-pande merged commit e8e06f0 into openshift-knative:release-v1.16 May 6, 2025
1 of 8 checks passed
@dsimansk
Copy link
Author

dsimansk commented Oct 1, 2025

/cherry-pick release-v1.17

@openshift-cherrypick-robot

@dsimansk: #694 failed to apply on top of branch "release-v1.17":

Applying: Fix build script
Using index info to reconstruct a base tree...
M	hack/build.sh
Falling back to patching base and 3-way merge...
Auto-merging hack/build.sh
CONFLICT (content): Merge conflict in hack/build.sh
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Fix build script

Details

In response to this:

/cherry-pick release-v1.17

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-sigs/prow repository.

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.

3 participants