ober/jerboa-shell
1
0
Fork 0
Code Issues 14 Pull requests 2 Projects Releases Packages Wiki Activity Actions

Fix stale extras patch application #100

Open
ober wants to merge 1 commit from fix/clean-patch-application into master
pull from: fix/clean-patch-application
merge into: ober:master
Conversation 0 Commits 1 Files changed 2 +23 -5
ober commented 2026-09-24 13:45:07 -04:00
Owner
Copy link

The merged extras commit already contains the jdisk test, dependency lock, and native symbol entries that the shell overlay patches tried to add again. Those stale hunks left reject files during every clean all-features build. The Android rollback patch also targeted an older mux-server layout with no Android unlock handler.

This change removes the duplicate overlay hunks and gates the Android rollback patch on the handler it modifies. VERSION advances to 0.12.1.

Validation:

  • Clean patch replay exits 0 with no .rej or .orig files.
  • Clean all-features macOS build exits 0.
  • jsh-macos is Mach-O arm64.
  • JSH_BATCH=1 JSH_EMBED_ENCRYPT=0 ./jsh-macos -c 'printf "JSH_BINARY_SMOKE_OK\\n"' passes.
The merged extras commit already contains the jdisk test, dependency lock, and native symbol entries that the shell overlay patches tried to add again. Those stale hunks left reject files during every clean all-features build. The Android rollback patch also targeted an older mux-server layout with no Android unlock handler. This change removes the duplicate overlay hunks and gates the Android rollback patch on the handler it modifies. VERSION advances to 0.12.1. Validation: - Clean patch replay exits 0 with no .rej or .orig files. - Clean all-features macOS build exits 0. - jsh-macos is Mach-O arm64. - `JSH_BATCH=1 JSH_EMBED_ENCRYPT=0 ./jsh-macos -c 'printf "JSH_BINARY_SMOKE_OK\\n"'` passes.
Fix stale extras patch application
Some checks failed
version-policy / required (pull_request) Successful in 3m46s
Details
required-ci / required (pull_request) Failing after 4m13s
Details
3a47265c21
ober force-pushed fix/clean-patch-application from 3a47265c21
Some checks failed
version-policy / required (pull_request) Successful in 3m46s
Details
required-ci / required (pull_request) Failing after 4m13s
Details
to 5af08dba52
All checks were successful
version-policy / required (pull_request) Successful in 3m59s
Details
required-ci / required (pull_request) Successful in 12m59s
Details
2026-09-24 13:47:55 -04:00 Compare
All checks were successful
version-policy / required (pull_request) Successful in 3m59s
Required
Details
required-ci / required (pull_request) Successful in 12m59s
Required
Details
This pull request doesn't have enough approvals yet. 0 of 1 approvals granted.
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin fix/clean-patch-application:fix/clean-patch-application
git switch fix/clean-patch-application
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
ober/jerboa-shell!100
No description provided.