Hotfix: Test changes over #6114 #6115
Open
+50
−37
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
singiamtel
force-pushed
the
6114_hotfix
branch
3 times, most recently
from
beced63 to
b8dd500
Compare
Collaborator
Author
|
Overriden by #6114 |
singiamtel
force-pushed
the
6114_hotfix
branch
from
b8dd500 to
cfde5ef
Compare
ktf
reviewed
Feb 10, 2026
singiamtel
force-pushed
the
6114_hotfix
branch
2 times, most recently
from
c9cf9d4 to
92d2bd8
Compare
ktf
reviewed
Feb 11, 2026
| ${PROTOBUF_ROOT:+-DProtobuf_DIR=${PROTOBUF_ROOT}} \ | ||
| ${ABSEIL_ROOT:+-Dabsl_DIR=$ABSEIL_ROOT} \ | ||
| ${C_ARES_ROOT:+-Dc-ares_DIR=$C_ARES_ROOT} \ | ||
| -Dre2_DIR=${RE2_ROOT:-$(brew --prefix re2)/lib/cmake/re2} \ |
Member
There was a problem hiding this comment.
This will fail when not on macOS, no?
ktf
reviewed
Feb 11, 2026
| export CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH=OFF | ||
|
|
||
| # Build CMAKE_PREFIX_PATH without trailing colons from unset variables | ||
| CMAKE_PREFIX_PATH_components="$ABSEIL_ROOT/cmake:$PROTOBUF_ROOT/cmake" |
Member
There was a problem hiding this comment.
why not
Suggested change
| CMAKE_PREFIX_PATH_components="$ABSEIL_ROOT/cmake:$PROTOBUF_ROOT/cmake" | |
| CMAKE_PREFIX_PATH="$ABSEIL_ROOT/cmake:$PROTOBUF_ROOT/cmake${C_ARES_ROOT:+:$C_ARES_ROOT}" |
?
Why using a different name from the CMake define?
ktf
reviewed
Feb 11, 2026
| -G Ninja \ | ||
| ${CXXSTD:+-DCMAKE_CXX_STANDARD=$CXXSTD} \ | ||
| -DCMAKE_INSTALL_PREFIX=$INSTALLROOT \ | ||
| -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH_components \ |
Member
There was a problem hiding this comment.
See above...
Suggested change
| -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH_components \ | |
| -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH \ |
ktf
reviewed
Feb 11, 2026
| alibuild-generate-module --bin --lib > etc/modulefiles/$PKGNAME | ||
| mkdir -p $INSTALLROOT/etc/modulefiles && rsync -a --delete etc/modulefiles/ $INSTALLROOT/etc/modulefiles | ||
| mkdir -p "$INSTALLROOT/etc/modulefiles" | ||
| alibuild-generate-module --bin --lib >"$INSTALLROOT/etc/modulefiles/$PKGNAME" |
Member
There was a problem hiding this comment.
This will break the incremental recipe. Why changing it?
ktf
reviewed
Feb 11, 2026
|
|
||
| # export compile_commands.json in (taken from o2.sh) | ||
| DEVEL_SOURCES="$(readlink $SOURCEDIR || echo $SOURCEDIR)" | ||
| DEVEL_SOURCES="$(readlink "$SOURCEDIR" || echo "$SOURCEDIR")" |
Member
There was a problem hiding this comment.
Unrelated. Please move them to a separate PR.
ktf
reviewed
Feb 11, 2026
| if [ "$DEVEL_SOURCES" != "$SOURCEDIR" ]; then | ||
| perl -p -i -e "s|$SOURCEDIR|$DEVEL_SOURCES|" compile_commands.json | ||
| ln -sf $BUILDDIR/compile_commands.json $DEVEL_SOURCES/compile_commands.json | ||
| ln -sf "$BUILDDIR"/compile_commands.json "$DEVEL_SOURCES"/compile_commands.json |
Member
There was a problem hiding this comment.
Unrelated. Please move them to a separate PR.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Rebased on #6114 but with some temporary fixes for the CI