Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 7ca42ec1 authored by Corey Bryant's avatar Corey Bryant Committed by GitHub
Browse files

Merge pull request #9673 from coreycb/fix-merge-release 

Remove versionNameSuffix on beta->release merge
parents bd3d863e ac04365d

scripts/ci/merges/merge_gradle.py

+7 −0
Original line number Diff line number Diff line
@@ -73,3 +73,10 @@ if branch == "beta": 
            replace_matching_line(ours, search_term, new_line)

    else:

        raise SystemExit(f"Search term '{search_term}' not found in theirs file.")

elif branch == "release":

    search_term = r"versionNameSuffix = \"b[1-9]\""

    found_line = find_matching_line(theirs, search_term)

    if found_line:

        replace_matching_line(ours, search_term, "")

    else:

        raise SystemExit(f"Search term '{search_term}' not found in theirs file.")