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

Commit bb294aff authored by Nishith  Khanna's avatar Nishith Khanna
Browse files

Upstream changes shouldn't be automatically merged

parent 9976314d
Loading
Loading
Loading
Loading
Loading
+1 −10
Original line number Diff line number Diff line
@@ -53,15 +53,7 @@ build:
    - git pull upstream $UPSTREAM_DEFAULT_BRANCH
    - git push origin $UPSTREAM_BRANCH
    - git push origin --tags
# checkout to latest tag commit to $TEMP_LATEST_TAG_BRANCH
    - git checkout $(git describe --tags --abbrev=0)
    - git checkout -b $TEMP_LATEST_TAG_BRANCH
# merge $LOCAL_BRANCH with $TEMP_LATEST_TAG_BRANCH & push
    - git checkout $LOCAL_BRANCH
    - git merge $TEMP_LATEST_TAG_BRANCH
    - git push origin $LOCAL_BRANCH
# remove unwanted local branch & remote
    - git branch -D $TEMP_LATEST_TAG_BRANCH
# remove upstream remote
    - git remote remove upstream

update-default-branch:
@@ -71,4 +63,3 @@ update-default-branch:
    UPSTREAM_BRANCH: upstream/master
    UPSTREAM_DEFAULT_BRANCH: main
    UPSTREAM_URL: https://github.com/k9mail/k-9.git
    TEMP_LATEST_TAG_BRANCH: latest_upstream_tag_branch