-
Notifications
You must be signed in to change notification settings - Fork 174
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
update(ci): bump zig to official 0.14.0 and drop caching #2300
base: master
Are you sure you want to change the base?
Conversation
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: FedeDP 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 |
/hold |
/milestone 0.21.0 |
Perf diff from master - unit tests
Heap diff from master - unit tests
Heap diff from master - scap file
Benchmarks diff from master
|
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #2300 +/- ##
=======================================
Coverage 77.17% 77.17%
=======================================
Files 224 224
Lines 30133 30133
Branches 4600 4605 +5
=======================================
Hits 23256 23256
Misses 6877 6877
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
0cfc1e4
to
cebbd47
Compare
Testing locally, the CI passes only for debug builds. Investigating. |
Opened a tracking issue: ziglang/zig#23185 🙏 i found a workaround but i'll wait for upstream feedback before proposing it. |
I found out the issue: we were building zlib without |
Signed-off-by: Federico Di Pierro <[email protected]>
Signed-off-by: Federico Di Pierro <[email protected]>
Signed-off-by: Federico Di Pierro <[email protected]>
Signed-off-by: Federico Di Pierro <[email protected]>
Signed-off-by: Federico Di Pierro <[email protected]>
Signed-off-by: Federico Di Pierro <[email protected]>
Will unhold once falcosecurity/falco#3508 CI passes fine. |
@@ -8,23 +8,11 @@ runs: | |||
shell: bash | |||
id: store | |||
env: | |||
ZIG_VERSION: '0.14.0-dev.3188+34644511b' | |||
ZIG_VERSION: '0.14.0' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Bump zig version and drop caching.
@@ -72,8 +72,8 @@ else() | |||
URL_HASH "SHA256=e51cc8fc496f893e2a48beb417730ab6cbcb251142ad8b2cd1951faa5c76fe3d" | |||
# TODO what if using system zlib? | |||
CONFIGURE_COMMAND | |||
CPPFLAGS=-I${ZLIB_INCLUDE} LDFLAGS=-L${ZLIB_SRC} ./configure | |||
CXXFLAGS=${PROTOBUF_CXXFLAGS} --with-zlib ${PROTOBUF_CONFIGURE_FLAGS} | |||
./configure CXXFLAGS=${PROTOBUF_CXXFLAGS} --with-zlib-include=${ZLIB_INCLUDE} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Use the protobuf configure
way of passing CPPFLAGS and LDFLAGS
; this is basically the same we did before.
@@ -55,6 +55,7 @@ else() | |||
-DRE2_BUILD_TESTING=OFF | |||
-DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} | |||
-DCMAKE_INSTALL_PREFIX=${RE2_SRC} | |||
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Build re2 with the same build type of the main project.
@@ -45,9 +45,13 @@ else() | |||
"${ZLIB_INCLUDE}/zutil.h" | |||
) | |||
if(NOT TARGET zlib) | |||
set(ZLIB_CFLAGS) | |||
if(CMAKE_BUILD_TYPE STREQUAL "Release") | |||
set(ZLIB_CFLAGS "-O3") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Build zlib with the same optimization of the main project.
Signed-off-by: Federico Di Pierro <[email protected]>
…uilds. Signed-off-by: Federico Di Pierro <[email protected]>
/unhold |
What type of PR is this?
/kind cleanup
Any specific area of the project related to this PR?
/area CI
Does this PR require a change in the driver versions?
What this PR does / why we need it:
Zig 0.14.0 has been released, we don't need to cache the version ourselves.
Which issue(s) this PR fixes:
Fixes #
Special notes for your reviewer:
Does this PR introduce a user-facing change?: