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.

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

Makefile: Fix condition for varlink_generate #7854

Closed
wants to merge 1 commit into from
Closed

Makefile: Fix condition for varlink_generate #7854

wants to merge 1 commit into from

Conversation

rhafer
Copy link
Contributor

@rhafer rhafer commented Sep 30, 2020

This should fix the call to the or function. Previously the condition
always evaluated to the empty string independed of the BULILDTAGS.
So go generate varlink was allways called.

Signed-off-by: Ralf Haferkamp rhafer@suse.com

@rhafer
Copy link
Contributor Author

rhafer commented Sep 30, 2020

Hm, I guess this needs #7834 to avoid the failure in the gating job

@rhafer
Makefile: Fix condition for varlink_generate
4840b38 
This should fix the call to the `or` function. Previously the condition
always evaluated to the empty string independed of the BULILDTAGS.
So `go generate varlink` was allways called.

Signed-off-by: Ralf Haferkamp <rhafer@suse.com>
@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: rhafer
To complete the pull request process, please assign vrothberg after the PR has been reviewed.
You can assign the PR to them by writing /assign @vrothberg in a comment when ready.

The full list of commands accepted by this bot can be found 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

rhafer
rhafer commented Oct 1, 2020
View reviewed changes
Makefile
@@ -620,7 +620,7 @@ endef

# $BUILD_TAGS variable is used in hack/golangci-lint.sh
.PHONY: varlink_generate
ifneq (or $(findstring varlink,$(BUILDTAGS)),$(findstring varlink,$(BUILD_TAGS)))
ifneq (,$(or $(findstring varlink,$(BUILDTAGS)),$(findstring varlink,$(BUILD_TAGS))))
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am still confused about how this is supposed to work for the make golangci-lint target. (See the gating failure in https://cirrus-ci.com/task/5884302384693248). It's true that hack/golangci-lint.sh sets the BUILD_TAGS variable, but that happens after this part here is executed. So it will never have an effect here.

I guess this only ever worked because the condition was broken?

@github-actions
Copy link

github-actions bot commented Nov 1, 2020

A friendly reminder that this PR had no activity for 30 days.

@rhatdan
Copy link
Member

rhatdan commented Nov 3, 2020

Since we are dropping support for varlink soon, I am going to close this PR.

@rhatdan rhatdan closed this Nov 3, 2020
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 24, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 24, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. stale-pr
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@rhafer @openshift-ci-robot @rhatdan