Skip to content

✨ (alpha update) skip running make targets if Makefile has conflicts #5019

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 1 commit into from
Aug 19, 2025
Merged

✨ (alpha update) skip running make targets if Makefile has conflicts #5019

merged 1 commit into from
Aug 19, 2025
+25 −1

Conversation

camilamacedo86
Copy link
Member

Closes: #4989

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Aug 18, 2025
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: camilamacedo86

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

The pull request process is described here

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 18, 2025
@camilamacedo86
Copy link
Member Author

c/c @vitorfloriano could you please review this one?

@vitorfloriano
Copy link
Contributor

The command correctly skips running make targets when there are conflict markers in the Makefile. It also warns the user about the skipping with a clear message.

/lgtm

@k8s-ci-robot
Copy link
Contributor

@vitorfloriano: changing LGTM is restricted to collaborators

In response to this:

The command correctly skips running make targets when there are conflict markers in the Makefile. It also warns the user about the skipping with a clear message.

/lgtm

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.

@camilamacedo86 camilamacedo86 added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 19, 2025
@vitorfloriano vitorfloriano mentioned this pull request Aug 19, 2025
Closed
@k8s-ci-robot k8s-ci-robot merged commit ec3d604 into kubernetes-sigs:master Aug 19, 2025
18 checks passed
@camilamacedo86 camilamacedo86 deleted the enhance-targets-conf branch August 19, 2025 16:58
@camilamacedo86 camilamacedo86 mentioned this pull request Aug 22, 2025
Merged
@camilamacedo86 camilamacedo86 mentioned this pull request Aug 25, 2025
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Kavinjsir Kavinjsir Awaiting requested review from Kavinjsir

@varshaprasad96 varshaprasad96 Awaiting requested review from varshaprasad96

Assignees

No one assigned

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

alpha update runs make targets when there are conflicts

3 participants

@camilamacedo86 @k8s-ci-robot @vitorfloriano