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.

Sign up for GitHub

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

Jump to bottom

Include external projects as subtrees #280

Merged
merged 14 commits into from
Feb 21, 2025
Merged

Include external projects as subtrees #280

merged 14 commits into from
Feb 21, 2025

Conversation

chrjabs
Copy link
Owner

@chrjabs chrjabs commented Feb 20, 2025

Description of the Contribution

Including external dependencies as subprojects should have a couple of advantages:

  • Since I maintain the minisat and glucose repos mainly for RustSAT anyway, it sort of makes more sense to have them more directly included
  • The necessary patches (for CaDiCaL) can be directly applied, so we can ship the newest version of CaDiCaL with the crate
  • Nix flakes struggle with git submodules, so working with them should become easier

PR Checklist

  • I read and agree to CONTRIBUTING.md
  • I have formatted my code with rustfmt / cargo fmt --all
  • Commits are named following conventional commits
  • I have added documentation for new features
  • The test suite still passes on this PR
  • I have added tests for new features / tests that would have caught the bug this PR fixes (please explain if not)
  • If this PR contains breaking changes, it is against the next-major branch, not against main

chrjabs added 14 commits February 21, 2025 13:56
@chrjabs
fix(cadical): index out of bounds error in old propagate
450b152
@chrjabs
chore(treewide): remove submodules
ed714f0
@chrjabs
Squashed 'minisat/cppsrc/' content from commit 7b764e3
7a50711 
git-subtree-dir: minisat/cppsrc
git-subtree-split: 7b764e30560525a85827f549b40727550747bdc2
@chrjabs
chore(minisat): include source as subtree
a05e289
@chrjabs
Squashed 'glucose/cppsrc/' content from commit 8cce0a1
0fb6574 
git-subtree-dir: glucose/cppsrc
git-subtree-split: 8cce0a16ecd7ae73fc77adb37abe4924660027f4
@chrjabs
chore(glucose): include source as subtree
9bf4b65
@chrjabs
Squashed 'kissat/csrc/' content from commit f7e5776
1c51ad8 
git-subtree-dir: kissat/csrc
git-subtree-split: f7e57764c19cf35198830575492dc9d80e872b55
@chrjabs
chore(kissat): include source as subtree
fa3da21
@chrjabs
docs(kissat): details on downloading at compile time
3cf3100
@chrjabs
chore(cadical): prepare for subtree inclusion
8f6ecb2
@chrjabs
Squashed 'cadical/cppsrc/' content from commit f13d7443
a0da763 
git-subtree-dir: cadical/cppsrc
git-subtree-split: f13d74439a5b5c963ac5b02d05ce93a8098018b8
@chrjabs
chore(cadical): include source as subtree
966b1d0
@chrjabs
chore(cadical): apply modifications
6dcec86
@chrjabs
feat(cadical): include source for newest version
b166879
@chrjabs chrjabs marked this pull request as ready for review February 21, 2025 12:02
@chrjabs chrjabs merged commit b166879 into main Feb 21, 2025
52 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@chrjabs