Merge branch 'release/10.0.4'
# Conflicts: # CHANGELOG.md # package.json # setup.cfg # sickrage/checksums.md5 # sickrage/core/webserver/static/js/core.min.js # sickrage/version.txt
Showing
... | ... | @@ -109,22 +109,23 @@ 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) | ||
- yarn install --pure-lockfile --cache-folder .yarn-cache | ||
- 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 }') | ||
- bumpversion --allow-dirty release package.json sickrage/version.txt | ||
- git checkout -b release-$(cat sickrage/version.txt) | ||
- npx auto-changelog -v $RELEASE_VERSION --hide-credit --package --commit-limit false --ignore-commit-pattern \[TASK\].* | ||
- yarn install --pure-lockfile --cache-folder .yarn-cache | ||
- yarn run build | ||
- python checksum-generator.py | ||
- git checkout -b release/$RELEASE_VERSION | ||
- git fetch --all | ||
- git add --all | ||
- git commit -m "[TASK] Releasing v$(cat sickrage/version.txt)" | ||
- git fetch . release-$(cat sickrage/version.txt):master | ||
- git fetch . release-$(cat sickrage/version.txt):develop | ||
- git tag -a $(cat sickrage/version.txt) -m "Release v$(cat sickrage/version.txt) master" | ||
- npx auto-changelog --hide-credit --package --commit-limit false --ignore-commit-pattern \[TASK\].* | ||
- git add CHANGELOG.md | ||
- git commit --amend --no-edit | ||
- git tag -f -a $(cat sickrage/version.txt) -m "Release v$(cat sickrage/version.txt) master" | ||
- git commit -m "[TASK] Releasing v$RELEASE_VERSION" | ||
- git checkout master | ||
- git fetch --all | ||
- git merge --ff-only 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 | ||
- bumpversion --allow-dirty patch package.json sickrage/version.txt | ||
... | ... | @@ -155,6 +156,7 @@ release_build_develop: |
- pip install bumpversion | ||
- pip install -r requirements-dev.txt | ||
- bumpversion --allow-dirty dev package.json sickrage/version.txt | ||
- npx auto-changelog -v $(cat sickrage/version.txt) --hide-credit --unreleased --package --commit-limit false --ignore-commit-pattern \[TASK\].* | ||
- yarn run build | ||
- python checksum-generator.py | ||
# - python setup.py extract_messages | ||
... | ... | @@ -166,10 +168,6 @@ release_build_develop: |
- git add --all | ||
- git commit -m "[TASK] Pre-Releasing v$(cat sickrage/version.txt)" | ||
- git tag -a $(cat sickrage/version.txt) -m "Pre-release v$(cat sickrage/version.txt)" | ||
- npx auto-changelog --hide-credit --unreleased --package --commit-limit false --ignore-commit-pattern \[TASK\].* | ||
- git add CHANGELOG.md | ||
- git commit --amend --no-edit | ||
- git tag -f -a $(cat sickrage/version.txt) -m "Pre-release v$(cat sickrage/version.txt)" | ||
- git push https://$GIT_ACCESS_USER:[email protected]$CI_SERVER_HOST/$CI_PROJECT_PATH.git HEAD:$CI_COMMIT_REF_NAME --follow-tags | ||
only: | ||
- [email protected]/sickrage | ||
... | ... |
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
... | ... | @@ -19,7 +19,6 @@ |