Release 1.10.4 by rich0 · Pull Request #61 · rich0/cfg-update

rich0 · 2026-06-20T14:37:48Z

Summary

Patch release bringing develop to master.

User-facing

Remove gtkdiff and imediff2; use imediff 3.4.x+ for CLI merges
Align merge-tool documentation across help, conf, DEPENDENCIES, and ebuild
Fix version string consistency ($version now matches README/ebuild)

Maintainer

GitHub Actions CI (perl -c, check-version.sh, run-tests.sh --full)
bump-version.sh / check-version.sh and VERSIONING.md workflow

ChangeLog

Drop gtkdiff and imediff2 merge-tool support; align merge-tool lists in
help, cfg-update.conf, DEPENDENCIES.md, and ebuild postinst (issues #53,
#58, #59). Fix cfg-update $version to match README and ebuild PV.
Maintainer: add GitHub Actions CI, release scripts, and expanded tests
(issues #39, #46, #47).

Checklist

./scripts/check-version.sh 1.10.4 passes locally
perl -c cfg-update passes
./test/run-tests.sh --full passes (196 passed)
CI integration check green on this PR

Post-merge

Maintainer checklist: issue #60

… and bump script

Signed-off-by: Richard Freeman <rich0@gentoo.org>

…rify Replace ebuild copy with git mv so only one gentoo/cfg-update-*.ebuild remains. Insert ChangeLog stubs after the header block (ISO dates). Verify cfg-update, README, and ebuild PV match after the bump. Document the conventions in VERSIONING.md and add a Tier 0 dry-run smoke test.

Signed-off-by: Richard Freeman <rich0@gentoo.org>

feat: add develop branch model, release process docs, and bump-version script

Signed-off-by: Richard Freeman <rich0@gentoo.org>

Refactor internal path variables to descriptive names (issue #31)

Remove redundant ancestor-backup existence checks, trim per-scenario classify to four canary fixtures, consolidate removed-flag regression into one Tier A function, and drop a duplicate stage4 sdiff assert. Update test/README.md to document the A1–A4 sub-tier layout.

test: prune overlapping assertions and reorganize tiers (issue #39)

Run ./test/run-tests.sh --full on ubuntu-latest with harness dependencies (diffutils, libterm-readkey-perl, shellcheck).

Add GitHub Actions test workflow for pull requests (issue #46)

Introduce a git-independent scripts/check-version.sh, wire it into CI and bump-version.sh, and document repository rulesets plus PR-based releases to master.

- Step 8: merge master into develop is required after every release - Default branch: keep master for stable public view - Remove redundant up-to-date-before-merge explainer

Branch protection: version check and ruleset docs (issue #47)

Reframe INVENTORY, DEPENDENCIES, and ARCHITECTURE to describe the current 1.10.3 codebase instead of the staged cleanup roadmap. Delete the unused test.tgz archive and stop installing it via the ebuild; fixtures in test/fixtures/ are canonical for the harness.

Delete test/fixtures/legacy/ and drop references from test README and scenario docs per PR review.

Post-prune documentation and repo hygiene (issue #29)

…53) xxdiff has first-class support in cfg-update (launch_tool, check_gui, check_tool, cfg-update.conf) but was missing from the merge tools table in DEPENDENCIES.md. Add it after kdiff3 with portage availability note.

docs: add xxdiff to recommended merge tools in DEPENDENCIES.md

…53) Follow-up to #53 / PR #54. Add tkdiff, gvimdiff, and kompare to DEPENDENCIES.md; add imediff and kompare to cfg-update.conf supported tools table; sync ebuild pkg_postinst with current tool set; expand ARCHITECTURE.md merge-tool capability lists. gtkdiff Stage 4 detection deferred to #55.

docs: align merge tool lists across DEPENDENCIES, conf, and ebuild

Drop obsolete imediff2 detection and documentation. Modern dev-util/imediff supports both 2-way and 3-way merges; existing -a -o launch_tool invocations are unchanged. Add Tier D mock imediff tests for stage 3 (3-way) and stage 4 (2-way) to lock in command-line arguments and merge outcomes. Fixes #57

gtkdiff is no longer packaged on Gentoo and was only half-integrated (launch_tool support without stage 4 detection). Remove from code paths, config template, ebuild hints, and inventory. Fixes #55

cleanup: remove gtkdiff from supported merge tools

Resolve conflicts with gtkdiff removal (PR #59): keep imediff-only support and no gtkdiff in tool_saves_mergefile_when_aborted or --help.

cleanup: remove imediff2 legacy; add imediff invocation tests

rich0 and others added 30 commits June 19, 2026 18:30

Update AGENTS.md for develop branch model and release process

c53c7f1

Update VERSIONING.md to full release process including develop branch…

49a2641

… and bump script

Add bump-version.sh script for conventional release process

a935d7a

Fix bump-version.sh script with full implementation

1dd335f

Complete the bump-version.sh script

04a500f

Complete bump-version.sh with full functional script

c557c3e

Remove redundant versioning process

9eaacf8

Signed-off-by: Richard Freeman <rich0@gentoo.org>

Fix truncated script.

ebbbc29

Signed-off-by: Richard Freeman <rich0@gentoo.org>

Revert test changes - this won't be practical outside of git.

76fe196

Signed-off-by: Richard Freeman <rich0@gentoo.org>

Merge pull request #44 from rich0/feature/releasescript

f688493

feat: add develop branch model, release process docs, and bump-version script

Rename $file7 to $path_temp_new (issue #31)

044a6b6

Rename $file6 to $path_temp_old (issue #31)

5e5f1d9

Rename $file5 to $path_merged (issue #31)

c2fd9b3

Rename $file4 to $path_backup_new (issue #31)

e00195e

Rename $file3 to $path_backup_old (issue #31)

5ff3b31

Rename $file2 to $path_new (issue #31)

9c3729d

Rename $file1 to $path_live (issue #31)

402f0f2

Rename $executable to $is_executable (issue #31)

d0aa975

Rename $merge_conflict to $has_merge_conflict (issue #31)

4f9e67d

Rename $ancestor_found to $has_ancestor (issue #31)

af00817

Rename $file to $cfg_basename (issue #31)

bbacf3c

Bump version to 1.10.4 (issue #31)

94a2b7e

Document optimize_backups $path_new overload (issue #42)

03000b7

Revert version bump activities to use new conventions.

069fe46

Signed-off-by: Richard Freeman <rich0@gentoo.org>

Merge pull request #43 from rich0/refactor/varnames

3d4652f

Refactor internal path variables to descriptive names (issue #31)

Merge pull request #45 from rich0/cleanup/tests

48ef4e6

test: prune overlapping assertions and reorganize tiers (issue #39)

Add GitHub Actions test workflow for pull requests (issue #46)

9aec3eb

Run ./test/run-tests.sh --full on ubuntu-latest with harness dependencies (diffutils, libterm-readkey-perl, shellcheck).

Merge pull request #48 from rich0/feature/github-test-runner

1c4f83f

Add GitHub Actions test workflow for pull requests (issue #46)

rich0 and others added 17 commits June 20, 2026 10:06

Add version check and branch protection docs (issue #47)

73adaca

Introduce a git-independent scripts/check-version.sh, wire it into CI and bump-version.sh, and document repository rulesets plus PR-based releases to master.

Address PR review: keep master default, require post-release sync

9305491

- Step 8: merge master into develop is required after every release - Default branch: keep master for stable public view - Remove redundant up-to-date-before-merge explainer

Merge pull request #50 from rich0/feature/branch-protection

f88b2b1

Branch protection: version check and ruleset docs (issue #47)

test: remove legacy fixture directory (issue #29)

6760fab

Delete test/fixtures/legacy/ and drop references from test README and scenario docs per PR review.

chore: re-trigger CI

fa5fe5e

Merge pull request #49 from rich0/refactor/docs-sync

3de53d7

Post-prune documentation and repo hygiene (issue #29)

Merge pull request #54 from rich0/cleanup/dependencies-xxdiff

0c94552

docs: add xxdiff to recommended merge tools in DEPENDENCIES.md

Merge pull request #56 from rich0/cleanup/merge-tool-docs

72c40cb

docs: align merge tool lists across DEPENDENCIES, conf, and ebuild

cleanup: remove gtkdiff from supported merge tools

aa43c03

gtkdiff is no longer packaged on Gentoo and was only half-integrated (launch_tool support without stage 4 detection). Remove from code paths, config template, ebuild hints, and inventory. Fixes #55

Merge pull request #59 from rich0/cleanup/remove-gtkdiff

43a2355

cleanup: remove gtkdiff from supported merge tools

Merge origin/develop into cleanup/imediff-legacy

384bf64

Resolve conflicts with gtkdiff removal (PR #59): keep imediff-only support and no gtkdiff in tool_saves_mergefile_when_aborted or --help.

Merge pull request #58 from rich0/cleanup/imediff-legacy

aa393e3

cleanup: remove imediff2 legacy; add imediff invocation tests

Release 1.10.4

4ea11f6

github-project-automation Bot added this to Refactor/cleanup cfg-update Jun 20, 2026

github-project-automation Bot moved this to Backlog in Refactor/cleanup cfg-update Jun 20, 2026

rich0 mentioned this pull request Jun 20, 2026

Post-release checklist: cfg-update 1.10.4 #60

Closed

9 tasks

rich0 merged commit 1f2f099 into master Jun 20, 2026
1 check passed

github-project-automation Bot moved this from Backlog to Done in Refactor/cleanup cfg-update Jun 20, 2026

rich0 mentioned this pull request Jun 20, 2026

GitHub branch protection #47

Closed

rich0 deleted the release/1.10.4 branch August 1, 2026 14:10

Navigation Menu

Release 1.10.4 - #61

Release 1.10.4#61
rich0 merged 47 commits into
masterfrom
release/1.10.4

rich0 commented Jun 20, 2026 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

Conversation

rich0 commented Jun 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

User-facing

Maintainer

ChangeLog

Checklist

Post-merge

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

1 participant

rich0 commented Jun 20, 2026 •

edited

Loading