geomind_code/zinit_archive2
Archived
20
0
Fork 1
Code Issues 10 Pull requests 2 Projects Releases Packages 1 Wiki Activity Actions

Clean up stale branches and preserve valuable fixes #56

New issue
Closed
opened 2026-03-13 10:24:30 +00:00 by timur · 2 comments
timur commented 2026-03-13 10:24:30 +00:00
Owner
Copy link

Purpose

Several feature branches have gone stale after the major architecture refactor (job-based model, OSchema, Askama UI). They cannot be merged as-is but contain a few fixes worth preserving.

Plan

1. Archive and delete development_tty (PR #27)

  • Tag as archive/development_tty for future reference
  • Close PR #27 (unmergeable — 81 commits behind, every file diverged)
  • TTY/PTY feature to be reimplemented on a fresh branch per issue #26
  • Delete remote branch

2. Cherry-pick musl fix from development_fix_ci_build

  • One valuable fix: build_lib.sh incorrectly skips rustup target add for x86_64-unknown-linux-musl
  • Apply the 2-line fix to scripts/build_lib.sh on development
  • Delete remote branch

3. Cherry-pick CI + test fixes from development_fix_ci_tests

  • Narrow CI triggers from branches: ["*"] to [development, main] in build.yaml and test.yaml
  • Fix ZINIT_SERVER_BIN → ZINIT_OPENRPC_BIN env var mismatch in pid1 integration tests
  • Add missing .wait() after .kill() in pid1 test cleanup (zombie process lint)
  • Delete remote branch

4. Delete development_mik after merge

  • PR being merged separately (1-line CSS link addition)
  • Delete remote branch after merge confirms

Branches summary

Branch Unique value Action
development_tty PTY feature prototype (reference only) Archive tag + delete
development_fix_ci_build musl target fix in build_lib.sh Cherry-pick fix + delete
development_fix_ci_tests CI triggers + pid1 test fixes Cherry-pick fixes + delete
development_mik hero-bootstrap-bridge.css Merge PR + delete
## Purpose Several feature branches have gone stale after the major architecture refactor (job-based model, OSchema, Askama UI). They cannot be merged as-is but contain a few fixes worth preserving. ## Plan ### 1. Archive and delete `development_tty` (PR #27) - Tag as `archive/development_tty` for future reference - Close PR #27 (unmergeable — 81 commits behind, every file diverged) - TTY/PTY feature to be reimplemented on a fresh branch per issue #26 - Delete remote branch ### 2. Cherry-pick musl fix from `development_fix_ci_build` - One valuable fix: `build_lib.sh` incorrectly skips `rustup target add` for `x86_64-unknown-linux-musl` - Apply the 2-line fix to `scripts/build_lib.sh` on development - Delete remote branch ### 3. Cherry-pick CI + test fixes from `development_fix_ci_tests` - Narrow CI triggers from `branches: ["*"]` to `[development, main]` in build.yaml and test.yaml - Fix `ZINIT_SERVER_BIN` → `ZINIT_OPENRPC_BIN` env var mismatch in pid1 integration tests - Add missing `.wait()` after `.kill()` in pid1 test cleanup (zombie process lint) - Delete remote branch ### 4. Delete `development_mik` after merge - PR being merged separately (1-line CSS link addition) - Delete remote branch after merge confirms ## Branches summary | Branch | Unique value | Action | |--------|-------------|--------| | `development_tty` | PTY feature prototype (reference only) | Archive tag + delete | | `development_fix_ci_build` | musl target fix in build_lib.sh | Cherry-pick fix + delete | | `development_fix_ci_tests` | CI triggers + pid1 test fixes | Cherry-pick fixes + delete | | `development_mik` | hero-bootstrap-bridge.css | Merge PR + delete |
timur commented 2026-03-13 10:25:10 +00:00
Author
Owner
Copy link

Step 1 complete: development_tty

  • Tagged as archive/development_tty
  • Closed PR #27 with explanation
  • Deleted remote branch
### Step 1 complete: `development_tty` - Tagged as `archive/development_tty` - Closed PR #27 with explanation - Deleted remote branch
timur commented 2026-03-13 10:27:50 +00:00
Author
Owner
Copy link

Steps 2-4 complete

Step 2 — development_fix_ci_build:

  • Cherry-picked musl target fix into PR #57
  • Deleted remote branch

Step 3 — development_fix_ci_tests:

  • Cherry-picked CI trigger narrowing, pid1 env var fix, and zombie cleanup into PR #57
  • Deleted remote branch

Step 4 — development_mik:

  • Merged separately (hero-bootstrap-bridge.css)
  • Branch already auto-deleted after merge

Remaining branches

git branch -r
  origin/development          ✅ main dev branch
  origin/main                 ✅ release branch
  origin/fix/stale-branch-cleanup  ⏳ PR #57 pending merge

All stale branches cleaned up. Fixes preserved in PR #57.

### Steps 2-4 complete **Step 2 — `development_fix_ci_build`:** - Cherry-picked musl target fix into PR #57 - Deleted remote branch **Step 3 — `development_fix_ci_tests`:** - Cherry-picked CI trigger narrowing, pid1 env var fix, and zombie cleanup into PR #57 - Deleted remote branch **Step 4 — `development_mik`:** - Merged separately (hero-bootstrap-bridge.css) - Branch already auto-deleted after merge ### Remaining branches ``` git branch -r origin/development ✅ main dev branch origin/main ✅ release branch origin/fix/stale-branch-cleanup ⏳ PR #57 pending merge ``` All stale branches cleaned up. Fixes preserved in PR #57.
timur closed this issue 2026-03-13 12:46:46 +00:00
Commenting is not possible because the repository is archived.
No Branch/Tag specified
Branches Tags
development
development_dioxus_bootstrap
fix/system-config-startup
development_mik_6_1
development_tty2
development_kristof
main
v0.4.0
archive/development_tty
v0.1.3
v0.1.2
v0.1.1
v0.1.0
v0.0.1-rc1
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
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
geomind_code/zinit_archive2#56
No description provided.