Repository navigation
Preserve release history with verified merge commits - #81
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
1 participant
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 automation currently squash merges its generated PR. Use a normal merge commit so the release branch history remains reachable, then tag that actual merge commit after full CI.
The finalizer requests GitHub
merge_method=mergeand verifies that the resulting commit has exactly the tested base and PR head as its two parents, as well as the tested tree. A manually squash-merged or fast-forwarded release is rejected before tagging. Existing branch-protection and unchanged-main checks remain in place.Update the real-Git integration test to create a merge commit and assert its parents, including rejection of a one-parent commit. Synchronize EN/RU release and Fastlane documentation and record the release decision in AGENTS.md.
Validation:
bundle exec fastlane android python_checkspasses all 61 tests, pinned Black and isort checks. No release was created and existing tags were left unchanged.APK artifacts
Built from commit
8b00521fby CI run #293.Artifacts expire after 14 days. Neither APK uses the MegaProxy release key.