Commit b9dd99c2 authored by echel0n's avatar echel0n
Browse files

Minor changes to CI script

parent f62c58a8
......@@ -100,7 +100,6 @@ stages:
release_build_master:
stage: release_build
retry: 2
image:
name: nikolaik/python-nodejs:python3.8-nodejs10-alpine
variables:
......@@ -109,7 +108,6 @@ release_build_master:
- apk add --no-cache git gcc libffi-dev python3-dev musl-dev openssl-dev
- git config --global user.email $(git --no-pager show -s --format='%ae' HEAD)
- git config --global user.name $(git --no-pager show -s --format='%an' HEAD)
- git reset --hard
- pip install bumpversion
- pip install -r requirements-dev.txt
- RELEASE_VERSION=$(bumpversion --dry-run --list release | awk -F= '/new_version=/ { print $2 }')
......@@ -124,7 +122,7 @@ release_build_master:
- git commit -m "[TASK] Releasing v$RELEASE_VERSION"
- git checkout master
- git fetch --all
- git merge --ff-only release/$RELEASE_VERSION
- git merge release/$RELEASE_VERSION
- git tag -a $RELEASE_VERSION -m "Release v$RELEASE_VERSION master"
- git push https://$GIT_ACCESS_USER:[email protected]$CI_SERVER_HOST/$CI_PROJECT_PATH.git HEAD:master --follow-tags
- git checkout develop
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment