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

build: always populate partial version variables #1778

Merged
merged 1 commit into from
Nov 12, 2021

Conversation

dnwe
Copy link
Contributor

@dnwe dnwe commented Nov 9, 2021

What type of PR is this?

/kind bug

Any specific area of the project related to this PR?

/area build

What this PR does / why we need it:

When FALCO_VERSION was provided via a CMake variable, the build would
eventually fail because the partial version variables hadn't been
populated. Move the creation of those outside the check of FALCO_VERSION
being set so they also happen when that is provided too.

Which issue(s) this PR fixes:

Fixes: #1654

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

NONE

When FALCO_VERSION was provided via a CMake variable, the build would
eventually fail because the partial version variables hadn't been
populated. Move the creation of those outside the check of FALCO_VERSION
being set so they also happen when that is provided too.

Contributes-to: falcosecurity#1654

Signed-off-by: Dominic Evans <dominic.evans@uk.ibm.com>
@jasondellaluce
Copy link
Contributor

jasondellaluce commented Nov 10, 2021

Thanks for the fix! This seems to work for me!

Since this seems to fix #1654, can you add this to the PR description?

Fixes #1654 

That would help closing the issue automatically once this gets merged.

@dnwe
Copy link
Contributor Author

dnwe commented Nov 10, 2021

@jasondellaluce sure. I originally put it just as Contributes-to as I was waiting for the OP to confirm it worked for them too. Have updated to Fixes now I’ve had another confirm though.

Copy link
Member

@leogr leogr left a comment

Choose a reason for hiding this comment

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

LGTM, thank you!

/approve

@poiana
Copy link
Contributor

poiana commented Nov 11, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dnwe, leogr

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

@poiana
Copy link
Contributor

poiana commented Nov 11, 2021

LGTM label has been added.

Git tree hash: 5d9b65d6fb2cb00d0976b094f1e18e88a5e62c93

@poiana poiana merged commit d4aa7b9 into falcosecurity:master Nov 12, 2021
@leogr leogr added this to the 0.31.0 milestone Jan 28, 2022
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.

Build failure when specifying version
5 participants