Repository navigation
Resume untagged releases and accept verified squash merges - #126
Merged
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Release finalization currently rejects a manually squash-merged release PR, leaving its version committed on main without a tag. Accept a squash commit whose sole parent is the CI-verified base, while retaining exact tested-tree, CI identity, main ancestry and conflicting-tag checks. Refresh PR state after waiting for CI so a concurrent manual merge is recognized.
When preparation receives the current version and no remote tag exists, resume its unique merged release PR instead of incrementing versionCode, rewriting notes or opening another PR. Existing tags and older versions remain rejected. This allows a fresh workflow dispatch for 1.2.3 to resume PR #125 after this fix lands.
Updated EN/RU documentation, workflow input text and project memory. Real Git regression coverage exercises normal merge, squash during the CI wait, repeated finalization, same-version resume, existing-tag rejection, and refusal of untested trees or incorrect parents.
Validation:
bundle exec fastlane android python_checkspassed (78 tests plus pinned Black/isort checks);git diff --checkpassed. Read-only GitHub API lookup resolves release/v1.2.3 to merged PR #125. No release tag or publication was started.