Bump v6-36-04-alice7 #6064
Merged
Bump v6-36-04-alice7 #6064
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
Fixes issue with Merge
Member
Author
|
@shahor02 @pzhristov as discussed. |
Member
Author
|
@singiamtel can you have a look at: ++ rsync -a --delete etc/modulefiles/ /sw/slc9_x86-64/O2/6064-slc9_x86-64-local1/etc/modulefiles
++ [[ -n '' ]]
++ checkFindO2GPU
++ [[ -n /alidist ]]
++ [[ -f /alidist/resources/FindO2GPU.cmake ]]
++ cmp -s /alidist/resources/FindO2GPU.cmake /sw/SOURCES/O2/6064-slc9_x86-64/0/dependencies/FindO2GPU.cmake
++ [[ RELWITHDEBINFO == COVERAGE ]]
## End sw/BUILD/O2-latest/log Wed Dec 17 02:18:53 2025 (0.0s)
## Begin sw/BUILD/o2checkcode-latest/log Wed Dec 17 03:56:52 2025
++ cp /sw/slc9_x86-64/O2/6064-slc9_x86-64-local1/compile_commands.json .
+++ python3 -c 'import json, os; print(os.path.commonpath([x["file"] for x in json.loads(open("compile_commands.json").read()) if "sw/BUILD" not in x["file"] and "G__" not in x["file"] and x["file"].endswith(".cxx")]))'
++ O2_SRC=/sw/SOURCES/O2/6064-slc9_x86-64/0
++ [[ -e /sw/SOURCES/O2/6064-slc9_x86-64/0/CMakeLists.txt ]]
## End sw/BUILD/o2checkcode-latest/log Wed Dec 17 03:56:52 2025 (0.0s)I suspect we are hitting some corner case... |
Member
Author
|
This was requested by @shahor02 and TPC (IIUC) to fix the issue with the merging. @singiamtel could you please to an extra daily build with this ASAP, please? |
vascobarroso
pushed a commit
that referenced
this pull request
Dec 19, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes issue with Merge