Commit 61068398 authored by echel0n's avatar echel0n

Merge branch 'develop'

parents d4cfd2f6 4072c47a
......@@ -27,7 +27,7 @@ sentry_release_master:
- sentry-cli releases finalize $(cat sickrage/version.txt)
- sentry-cli releases deploys $(cat sickrage/version.txt) new -e $CI_COMMIT_REF_NAME
only:
- /^[0-9.]$/
- /^[0-9.]+$/
except:
- branches
- triggers
......@@ -61,7 +61,7 @@ deploy_docker_master:
project: sickrage/sickrage-docker
branch: master
only:
- /^[0-9.]$/
- /^[0-9.]+$/
except:
- branches
- triggers
......@@ -89,7 +89,7 @@ deploy_synology:
project: sickrage/sickrage-synology
branch: master
only:
- /^[0-9.]$/
- /^[0-9.]+$/
except:
- branches
- triggers
\ No newline at end of file
......@@ -239,7 +239,7 @@ module.exports = function (grunt) {
'bump_version:' + newVersion,
'exec:git_commit:Release v' + newVersion,
'exec:git:checkout:master',
'exec:git:merge:develop',
'exec:git:merge:develop:-m:Release v' + newVersion,
'exec:git_last_tag', 'exec:git_list_changes', 'exec:git_tag:' + newVersion,
'exec:git_push:origin:develop:tags',
'exec:git_push:origin:master:tags',
......
# Changelog
- * 4df45f161 - 2019-07-13: Fixed issue with gitlab-ci and pipelines for master branch.
- * f7067e987 - 2019-07-13: Pre-Release v9.4.131.dev1
- * 368e70c18 - 2019-07-13: Release v9.4.130
- * 9628b3657 - 2019-07-13: Release v9.4.129
- * 705d0bda1 - 2019-07-13: Release v9.4.128
- * 45aab9af9 - 2019-07-13: Release v9.4.127
......
9.4.130
\ No newline at end of file
9.4.131
\ 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