Commit 4a349cef authored by echel0n's avatar echel0n

Merge branch 'release/10.0.5'

parents 9c4ff3aa 0da70d5e
......@@ -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,10 +122,11 @@ 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
- git merge --ff-only release/$RELEASE_VERSION
- bumpversion --allow-dirty patch package.json sickrage/version.txt
- python checksum-generator.py
- git add --all
......
This diff is collapsed.
{
"name": "sickrage",
"version": "10.0.4",
"version": "10.0.5",
"private": true,
"repository": {
"type": "git",
......
......@@ -80,6 +80,7 @@ rsa==4.6
Send2Trash==1.5.0
sentry-sdk==0.19.5
service-identity==18.1.0
sgmllib3k==1.0.0
simplejson==3.17.2
six==1.15.0
soupsieve==2.0.1
......
[bumpversion]
current_version = 10.0.4
current_version = 10.0.5
commit = False
tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<dev>\d+))?
......
This diff is collapsed.
10.0.4
\ No newline at end of file
10.0.5
\ No newline at end of file
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