Skip to content

"Remove JGit" and add ability to run under CRuby / MRI #356

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
Merged
ryanfb merged 137 commits into from
Sep 12, 2025
Merged

"Remove JGit" and add ability to run under CRuby / MRI #356

ryanfb merged 137 commits into from
Sep 12, 2025

Conversation

@ryanfb
Copy link
Member

@ryanfb ryanfb commented Aug 27, 2025

This PR adds RUBY_PLATFORM-based codepaths for using rugged/libgit2 for git functionality instead of JGit. It also adds platform-specific split Gemfiles/lockfiles for bundler. These can be specified with the BUNDLE_GEMFILE environment variable, e.g. BUNDLE_GEMFILE=Gemfile.3.2 bundle install.

ryanfb added 30 commits July 1, 2025 16:41
@ryanfb
Use build matrix with CRuby 3.1 (for Rails 7.0.x) and JRuby
5534470 
(cherry picked from commit 0bf4b42)
@ryanfb
Un-vendor gems and use a split Ruby-specific Gemfile with BUNDLE_GEMFILE
0810f64 
(cherry picked from commit 691b455)
@ryanfb
BUNDLE_GEMFILE=Gemfile.jruby-9.4.9.0 bundle lock --add-platform unive…
2b165d8 
…rsal-java-17

(cherry picked from commit 884f27f)
@ryanfb
BUNDLE_GEMFILE=Gemfile.3.2 bundle lock --add-platform x86_64-linux
0ed54f6 
(cherry picked from commit 7f2284c)
@ryanfb
Swap File.exists? for File.exist?
9bd912c 
(cherry picked from commit 598a836)
@ryanfb
Add postgresql and sqlite3 gems for CRuby
0b31a26 
(cherry picked from commit b1a7a17)
@ryanfb
Backlock sqlite3 to ~> 1.4
ae8f49b 
(cherry picked from commit 1d01947)
@ryanfb
Add explicit db:migrate before tests
cb25972 
(cherry picked from commit fcda941)
@ryanfb
BUNDLE_GEMFILE=Gemfile.jruby-9.4.9.0 bundle
f29aebf 
(cherry picked from commit a7970ca)
@ryanfb
BUNDLE_GEMFILE=Gemfile.3.2 bundle
3c19cf8 
(cherry picked from commit 8c87e4f)
@ryanfb
Wrap ActiveRecord::Base.include in ActiveSupport.on_load
45a0bc3 
(cherry picked from commit 239351d)
@ryanfb
Use matrix ruby in artifact name
662468a 
(cherry picked from commit 46f4814)
@ryanfb
Add rugged (libgit2 bindings) for CGit
c248d79 
(cherry picked from commit 826f3d8)
@ryanfb
Only init JGit repo cache from JRuby
1d22573
@ryanfb
Wrap JGit access in JRuby check
6f87c45
@ryanfb
Wrap JGit access in JRuby check
86aa5b8
@ryanfb
Fix syntax for JRuby check
e5f1472
@ryanfb
Use unicode_normalize(:nfd) instead of java.text.Normalizer.normalize
2533ec6
@ryanfb
Add Repository#cgit_repo for Rugged::Repository
c261f90
@ryanfb
Map Rugged::BranchCollection into array of branch names
9215535
@ryanfb
Use bare CGit for get_file_from_branch and use as CRuby fallback
296188b
@ryanfb
Add automatic CGit fallback in Repository#create_branch
c60fa7a 
(cherry picked from commit 173a486)
@ryanfb
Always use JGit-based get_blob_from_branch from JRuby
30058d6
@ryanfb
Add bare CGit fallback for Repository#delete_branch
2c0c79a
@ryanfb
Guard jgit_actor being called from CRuby
d42f735
@ryanfb
Stub/use initial Rugged-based commit_content_cgit
a2de21b
@ryanfb
Rugged::Blob.from_buffer returns a String with the SHA1 instead of a …
5ef52d1 
…Rugged::Blob
@ryanfb
Pass existing tree from branch to Rugged::Tree::Builder.new
bd82da1
@ryanfb
Try using repo index with Rugged instead of TreeBuilder
5adc1b0
@ryanfb
Add stubbed committer/author for now
787697a
ryanfb added 29 commits August 19, 2025 16:40
@ryanfb
Add/use cgit_actor methods
cb78a53
@ryanfb
Refactor common logic for rolling a paths->blobs hash into Publicatio…
a3c057f 
…n#paths_blobs
@ryanfb
Just use clone of controlled_paths
6f7ca9c
@ryanfb
Set default Git user.name for CGit
3b0bede
@ryanfb
Use cgit_actor for default actor from CRuby
ae0e6bb
@ryanfb
Refactor to use paths_blobs_to_jgit_tree instead of repeating complic…
009f96d 
…ated Git tree construction
@ryanfb
flatten_commits still needs an ObjectInserter
06ae599
@ryanfb
Set up Repository#get_blob_oid_for_file_path_on_branch and Publicatio…
ec82db5 
…n#paths_blobs_oids
@ryanfb
Create/use Repository#commit_tree_to_branch_cgit
45d1f9c
@ryanfb
Add/use paths_blobs_oids_to_cgit_tree for CGit-based flatten_commits
7521a56
@ryanfb
Parent commit must be array
59df098
@ryanfb
Force finalizing publication branch rewrite during CGit-based flatten…
df71f8d 
…_commits
@ryanfb
Add CGit-based Publication#copy_back_to_user
5f2201a
@ryanfb
We need to get untrolled blob oids from the origin publication
ceb9818
@ryanfb
Add debug logging
09741f0
@ryanfb
Write blob contents back to origin for CGit copy back to user
f4e1a50
@ryanfb
Publication#commit_to_canon non-FF code path for CGit
6e5c2e2
@ryanfb
Add test user for test commit
90ec6d3
@ryanfb
Use the master commit on the finalizer repo that we read the tree fro…
9ebca37 
…m so that there's less chance for flatten_commits to race between multiple instances
@ryanfb
Cleanup
054ed94
@ryanfb
Try adding CRuby-specific build/test stages for GitLab CI
11991ec
@ryanfb
Just use build_tag in Makefile
c261d33
@ryanfb
Split RBENV_VERSION into Dockerfile build argument
f770805
@ryanfb
Explicit .ruby-version override inside Docker
fd13216
@ryanfb
Also pull BUNDLE_GEMFILE into Docker build arg
4c6180c
@ryanfb
Add cmake and libgit2-dev for rugged (CGit) inside Docker
52f8eb0
@ryanfb
Reorder ARG/ENV lines to cache initial build steps across builds
d5bf257
@ryanfb
Rugged also needs pkg-config
296641b
@ryanfb
CRuby postgres gem needs libpq-dev
17c58ba
@ryanfb ryanfb merged commit 98008b5 into papyri:master Sep 12, 2025
2 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

@ryanfb