Skip to content
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

Pre-check for 1.16.0 that supports C++20 #275

Closed

Conversation

jdblischak
Copy link
Collaborator

@jdblischak jdblischak commented Feb 7, 2025

Here is the pre-check PR for the future SOMA release that will support C++20. I followed my instructions in #246 (comment) to create the PR.

git checkout -b jdb/pre-check-cpp20-main

# Apply patch to support C++20
patch -p1 < .github/scripts/nightly/cpp20.patch
## patching file recipe/build-libtiledbsoma.sh
## patching file recipe/build-r-tiledbsoma.sh
## patching file recipe/build-tiledbsoma-py.sh
## patching file recipe/cc_wrap.sh
## patching file recipe/conda_build_config.yaml
## patching file recipe/cxx_wrap.sh
git commit -a -m "Support C++20" --author="XanthosXanthopoulos <[email protected]>"

# updated recipe to pull from main branch and committed

conda smithy rerender --commit auto

# Remove my code to update the nightly builds
git revert 9462dca5141914c05d94624f3b98546223ec5a61

@johnkerl once you have a candidate release ready to pre-check, we just need to update git_rev to point to that commit. You can either push directly to my branch (it's from my fork, so you'd have to add my fork as a remote), or you can simply share the SHA here and I can update the PR.

#3720 [sc-63626]

Revert "Apply cpp20 fixes from Xanthos to nightly build"

This reverts commit 9462dca.
@jdblischak jdblischak force-pushed the jdb/pre-check-cpp20-main branch from 4464e4b to bad3736 Compare February 7, 2025 20:52
@jdblischak
Copy link
Collaborator Author

I had to manually remove the [ci skip] from the commit message body of my reverted commit, since it caused the entire PR to skip CI.

@johnkerl johnkerl changed the title pre-check for 1.15.x that supports C++20 Pre-check for 1.15.x that supports C++20 Feb 7, 2025
@johnkerl
Copy link
Collaborator

johnkerl commented Feb 7, 2025

@jdblischak thank you -- this is fabulous!!!

TBD whether our next will be 1.15.8 or 1.16.0 -- requiring C++ 20 and GCC 13 is perhaps a "big enough change" to merit a 1.16.0. Let's keep this PR open for a bit until we decide what to call the next release, and when.

@jdblischak jdblischak changed the title Pre-check for 1.15.x that supports C++20 Pre-check for 1.16.0 that supports C++20 Feb 21, 2025
@johnkerl
Copy link
Collaborator

@jdblischak I used gh pr checkout 275 and updated the hash and the candidate tag -- thank you!

@johnkerl
Copy link
Collaborator

All green! Closing as per our established procedure.

@johnkerl johnkerl closed this Feb 21, 2025
@jdblischak
Copy link
Collaborator Author

I am also testing -DSPDLOG_LINK_SHARED=ON jdblischak@2b091ac in my fork

@jdblischak
Copy link
Collaborator Author

I am also testing -DSPDLOG_LINK_SHARED=ON jdblischak@2b091ac in my fork

As expected, this worked:

INFO (libtiledbsoma,lib/libtiledbsoma.so): Needed DSO lib/libspdlog.so.1.15 found in conda-forge/linux-64::spdlog==1.15.1=hb29a8c4_0

@johnkerl please include -DSPDLOG_LINK_SHARED=ON in recipe/build-libtiledbsoma.sh in the 1.16.0 update PRs

johnkerl added a commit that referenced this pull request Mar 5, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants