Skip to content

release: 2.2.3 - #54

Merged
ce5rpy merged 2 commits into
masterfrom
develop
Jul 3, 2026
Merged

release: 2.2.3#54
ce5rpy merged 2 commits into
masterfrom
develop

Conversation

@ce5rpy

@ce5rpy ce5rpy commented Jul 3, 2026

Copy link
Copy Markdown
Owner

Summary

ce5rpy and others added 2 commits July 3, 2026 14:38
parse_options_to_static in tgstats.py only recognized classic
TS1=...;TS2=... format, overwriting correct ts2_static values from
the server STATE_SND with empty lists for peers using OpenSpot
format (TS1_1=...;TS2_1=...). Add OpenSpot support to both
tgstats.parse_options_to_static and self_service_options.parse_options.
Preserve unknown keys (StartRef, RelinkTime, UserLink) for round-trip.
fix: parse OpenSpot/DMR+ OPTIONS format in tgstats and self-service
@github-actions

github-actions Bot commented Jul 3, 2026

Copy link
Copy Markdown
Contributor

Release PR — merge method

Commits listed on this PR: 2 (file diff may be smaller — that is normal when squash releases stacked up).

Required

Merge with Create a merge commit. Do not use Squash and merge.

Why

  • Squash on master creates new commit SHAs; develop keeps the original squash commits from feature PRs.
  • The next release PR then lists old fixes again even though master already has them.
  • Merge commit keeps the same SHAs on both branches; CI fast-forwards develop to master after chore(release) — no force-push, local git pull on develop still works.

One-time cleanup

If this PR lists commits from earlier releases (2.0.4, 2.0.5, …), merge once with merge commit; post-release sync realigns develop with master automatically.

@ce5rpy
ce5rpy merged commit 997c07c into master Jul 3, 2026
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant