diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 69702544c0b96aa315258c770632c25afc8b1e01..f4dd6b10a03aa420849316bb5a2c5ffe780899cb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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