Synchronize stable with develop branch #172
Merged
Conversation
This file contains 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
Dr. Tang fixed a compilation issue in NERSC CI where HDF5 cannot be detected even if the cray-parallel-hdf5 module is loaded on Perlmultter.
* pdc import, export, ls compiled successfully * removed requested files * formatting issues * changed install tools * gets checkpoint files * grabbing checkpoint files from within sub-directories, minor comments * Committing clang-format changes * Committing clang-format changes * Fix a few issues with pdc_ls * Committing clang-format changes --------- Co-authored-by: nickaruwang <nickwan0318@gmail.com> Co-authored-by: Nick Wang <66816536+nickaruwang@users.noreply.github.com> Co-authored-by: github-actions <github-actions[bot]@users.noreply.github.com> Co-authored-by: Jean Luca Bez <jlbez@lbl.gov>
Include support for Docker and Github Codespace so we can run our dev environment with the support of Docker.
SQLite and RocksDB support for KVtags
* include MacOS in CI * include dependencies * replace TCP with sockets * add libuuid * fix find UUID to correctly locate files in Ubuntu and MacOS * fix random segfault in strdup + malloc due to wrong allocation * ensure consistent use of defined variables * change transport for MacOS tests * update env * update dependencies-macos.sh * replace found to TRUE/FALSE * update documentation with timeout and MacOS specifics * fix git link to avoid authentication * change transport for tests * configure network for MacOS tests --------- Co-authored-by: github-actions <github-actions[bot]@users.noreply.github.com>
CI with cache and no-cache versions of PDC
jeanbez
added
type: documentation
|
@zhangwei217245 since most of the changes are from your commits, would you mind fixing the conflicts to make sure the latest changes will be reflected in the stable branch? |
|
The conflicting file list does not only contain my changes, but also some other changes, like the one I marked in the picture below. I'm always syncing with develop branch and I did not participate in the syncing between develop and stable. Not sure why this is happening. I will suggest that we perform a quick test to see if this ever happen again after resolving this PR. The test would be a super minor change (maybe an extra line in the code or an additional comments in the code somewhere) from a develop-based feature branch, and merge that to develop, and then sync to stable. If that happens again, we should think about what causes the problem.
|
* Synchronize stable with develop branch (#152) * Resolve conflicts
zhangwei217245
approved these changes
Jan 23, 2024
houjun
approved these changes
Jan 23, 2024
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.
Synchronize stable with develop branch with all the updates, bug fixes, and added features.