fix(cmake): fixed git dev versioning. #946

FedeDP · 2023-03-07T16:53:10Z

What type of PR is this?

/kind bug

Any specific area of the project related to this PR?

/area build

Does this PR require a change in the driver versions?

What this PR does / why we need it:

Fixes libs dev versioning by applying similar fixes as falcosecurity/falco#2292.

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

NONE

Signed-off-by: Federico Di Pierro <nierro92@gmail.com>

FedeDP · 2023-03-07T16:53:51Z

cmake/modules/versions.cmake

+    endif()
+    string(REGEX MATCH "^[0-9]+.[0-9]+.[0-9]+$" libs_tag ${dev_version})
+    string(REGEX MATCH "^[0-9]+.[0-9]+.[0-9]+\\+driver$" driver_tag ${dev_version})
+    message("Tags: ${libs_tag} ${driver_tag}")


Example output, tested with any combination of tags:

NO TAG: Tags: -- Libs version: 0.10.0-rc1-475+3f5ccfe Tags: -- Driver version: 4.0.1+driver-419+3f5ccfe TAG LIBS: Tags: 0.10.5 -- Libs version: 0.10.5 Tags: -- Driver version: 4.0.1+driver-419+3f5ccfe TAG DRV: Tags: -- Libs version: 0.10.0-rc1-475+3f5ccfe Tags: 4.0.2+driver -- Driver version: 4.0.2+driver BOTH: Tags: 0.10.5 -- Libs version: 0.10.5 Tags: 4.0.2+driver -- Driver version: 4.0.2+driver

I will remove this line that was just needed for testing ;)

Cleaned up!

Signed-off-by: Federico Di Pierro <nierro92@gmail.com>

FedeDP · 2023-03-07T16:57:11Z

Wip because i spotted a bug :/

FedeDP · 2023-03-07T17:05:23Z

Fixed; output is now correct in any case.

FedeDP · 2023-03-07T17:05:41Z

/milestone 0.11.0

FedeDP · 2023-03-07T17:08:21Z

To quickly test, fetch this branch and from the HEAD of this branch, try a cmake.
Libs and driver versions should start from 0.10.4- and 4.0.1- respectively.
Then, tag libs first, eg: 0.10.5, and see that the cmake now uses correct 0.10.5 version for libs only, while driver still is 4.0.1-....
Then, tag driver, eg: 4.0.2+driver, and see that cmake picks up tagged versions for both.
Then, delete libs tag and see that cmake still picks up the 4.0.2+driver version for the driver, and a 0.10.4-... version for userspace libs.

FedeDP · 2023-03-07T17:09:39Z

-- Libs version: 0.0.0
-- Driver version: 0.0.0

Ci is not picking up anything though :/

Perhaps we need to port also https://github.com/falcosecurity/falco/pull/2292/files#diff-b803fcb7f17ed9235f1e5cb1fcd2f5d3b2838429d4368ae4c57ce4436577f03f changes?

FedeDP · 2023-03-07T17:36:59Z

Nope it was already broken (see others opened PRs). I think we just miss git client in the ci.
I will test it tomorrow.

FedeDP · 2023-03-08T09:17:22Z

Ok we needed to add the git safe directory since we are using a debian:buster container that runs as root.

FedeDP · 2023-03-08T09:31:09Z

-- Libs version: 0.10.4-449+89b1a88
-- Driver version: 4.0.1+driver-445+89b1a88

Fixed!

FedeDP · 2023-03-08T09:38:36Z

.github/workflows/ci.yml

@@ -128,7 +136,7 @@ jobs:
            apt update && apt install -y --no-install-recommends ca-certificates cmake build-essential clang llvm git pkg-config autoconf automake libtool libelf-dev wget libb64-dev libc-ares-dev libcurl4-openssl-dev libssl-dev libtbb-dev libjq-dev libjsoncpp-dev libgrpc++-dev protobuf-compiler-grpc libgtest-dev libprotobuf-dev linux-headers-generic

          run: |
-            git config --global --add safe.directory ${{ github.workspace }}
+            git config --global --add safe.directory $GITHUB_WORKSPACE


Switched to use $GITHUB_WORKSPACE per this bug: actions/checkout#785

In this case we weren't affected, but since i used $GITHUB_WORKSPACE in other jobs, i decided to be consistent and use it everywhere.

FedeDP · 2023-03-08T09:39:18Z

cmake/modules/GetGitRevisionDescription.cmake

@@ -87,6 +87,111 @@ function(get_git_head_revision _refspecvar _hashvar)
            PARENT_SCOPE)
 endfunction()

+function(git_get_latest_tag _var)


This is basically copy-pasted from the Falco one.

FedeDP · 2023-03-08T09:40:38Z

cmake/modules/GetGitRevisionDescription.cmake

+    execute_process(COMMAND
+            "${GIT_EXECUTABLE}"
+            rev-list
+            ${ARGN}


Only difference from Falco one: we pass --tags too from external, because in git rev-list, --tags option takes an optional filtering argument, and we need to filter for +driver.
See https://git-scm.com/docs/git-rev-list.

FedeDP · 2023-03-08T09:41:26Z

cmake/modules/versions.cmake

+function(_get_git_version _var is_driver)
+    # Try to obtain the exact git tag
+    if (is_driver)
+        git_get_exact_tag(tag --match=*+driver)


This is exactly like before, but we are forcing the ARGN manually now.

FedeDP · 2023-03-08T09:42:24Z

cmake/modules/versions.cmake

+    endif()
+    string(REGEX MATCH "^[0-9]+.[0-9]+.[0-9]+$" libs_tag ${dev_version})
+    string(REGEX MATCH "^[0-9]+.[0-9]+.[0-9]+\\+driver$" driver_tag ${dev_version})
+    if(dev_version MATCHES "NOTFOUND$" OR (libs_tag STREQUAL "" AND driver_tag STREQUAL ""))


Algorithm is the same as on Falco: if we are not on a tag (ie: on a x.y.z or x.y.z+driver), we fetch HEAD, then latest tag (for driver or userspace), and then we mix them together to output a diff-from-latest_tag version.

Signed-off-by: Federico Di Pierro <nierro92@gmail.com>

Andreagit97

/approve

LucaGuerra

LGTM

I remember the bug in Falco that we fixed in the latest release

poiana · 2023-03-08T13:07:27Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Andreagit97, FedeDP, LucaGuerra

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:

~~OWNERS~~ [Andreagit97,FedeDP,LucaGuerra]

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

fix(cmake): fixed git dev versioning.

3f02d98

Signed-off-by: Federico Di Pierro <nierro92@gmail.com>

poiana added release-note-none kind/bug Something isn't working dco-signoff: yes area/build labels Mar 7, 2023

poiana requested review from hbrueckner and Molter73 March 7, 2023 16:53

poiana added approved size/L labels Mar 7, 2023

FedeDP commented Mar 7, 2023

View reviewed changes

cleanup(cmake): dropped test-only line.

7b1ff66

Signed-off-by: Federico Di Pierro <nierro92@gmail.com>

FedeDP changed the title ~~fix(cmake): fixed git dev versioning.~~ wip: fix(cmake): fixed git dev versioning. Mar 7, 2023

poiana added the do-not-merge/work-in-progress label Mar 7, 2023

FedeDP changed the title ~~wip: fix(cmake): fixed git dev versioning.~~ fix(cmake): fixed git dev versioning. Mar 7, 2023

poiana removed the do-not-merge/work-in-progress label Mar 7, 2023

poiana added this to the 0.11.0 milestone Mar 7, 2023

FedeDP force-pushed the fix/git_versioning branch from 0fa6171 to 8ef41b8 Compare March 8, 2023 08:49

FedeDP force-pushed the fix/git_versioning branch from f88f214 to bdb132f Compare March 8, 2023 09:24

FedeDP force-pushed the fix/git_versioning branch from bdb132f to 7319bf1 Compare March 8, 2023 09:31

FedeDP commented Mar 8, 2023

View reviewed changes

leogr previously approved these changes Mar 8, 2023

View reviewed changes

poiana assigned leogr Mar 8, 2023

poiana added the lgtm label Mar 8, 2023

FedeDP commented Mar 8, 2023

View reviewed changes

FedeDP added 2 commits March 8, 2023 10:44

fix(cmake): fixed ARGN passing.

083b02c

Signed-off-by: Federico Di Pierro <nierro92@gmail.com>

chore: fixed ci versioning.

e4db728

Signed-off-by: Federico Di Pierro <nierro92@gmail.com>

FedeDP dismissed leogr’s stale review via e4db728 March 8, 2023 09:44

FedeDP force-pushed the fix/git_versioning branch from 7319bf1 to e4db728 Compare March 8, 2023 09:44

Andreagit97 approved these changes Mar 8, 2023

View reviewed changes

poiana assigned Andreagit97 Mar 8, 2023

LucaGuerra approved these changes Mar 8, 2023

View reviewed changes

poiana assigned LucaGuerra Mar 8, 2023

poiana merged commit 8fadd99 into master Mar 8, 2023

poiana deleted the fix/git_versioning branch March 8, 2023 13:08

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(cmake): fixed git dev versioning. #946

fix(cmake): fixed git dev versioning. #946

FedeDP commented Mar 7, 2023

FedeDP Mar 7, 2023

FedeDP Mar 7, 2023

FedeDP Mar 7, 2023

FedeDP commented Mar 7, 2023

FedeDP commented Mar 7, 2023

FedeDP commented Mar 7, 2023

FedeDP commented Mar 7, 2023

FedeDP commented Mar 7, 2023 •

edited

Loading

FedeDP commented Mar 7, 2023

FedeDP commented Mar 8, 2023

FedeDP commented Mar 8, 2023

FedeDP Mar 8, 2023

FedeDP Mar 8, 2023

FedeDP Mar 8, 2023

FedeDP Mar 8, 2023

FedeDP Mar 8, 2023

Andreagit97 left a comment

LucaGuerra left a comment

poiana commented Mar 8, 2023

fix(cmake): fixed git dev versioning. #946

fix(cmake): fixed git dev versioning. #946

Conversation

FedeDP commented Mar 7, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

FedeDP commented Mar 7, 2023

FedeDP commented Mar 7, 2023

FedeDP commented Mar 7, 2023

FedeDP commented Mar 7, 2023

FedeDP commented Mar 7, 2023 • edited Loading

FedeDP commented Mar 7, 2023

FedeDP commented Mar 8, 2023

FedeDP commented Mar 8, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Andreagit97 left a comment

Choose a reason for hiding this comment

LucaGuerra left a comment

Choose a reason for hiding this comment

poiana commented Mar 8, 2023

FedeDP commented Mar 7, 2023 •

edited

Loading