Commit 1db69f77 authored by echel0n's avatar echel0n

Merge branch '9.4.117'

parents d054ad5a 1ee3cdb9
......@@ -83,7 +83,7 @@ deploy_docker_master_arm32v7:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD
- docker pull $CONTAINER_IMAGE:arm32v7-latest || true
- docker build --network host --build-arg="SOURCE_COMMIT=$CI_COMMIT_SHA" --cache-from $CONTAINER_IMAGE:arm32v7-latest -t $CONTAINER_IMAGE:arm32v7-$(cat sickrage/version.txt) -f Dockerfile.arm32v7 .
- docker tag $CONTAINER_IMAGE:arm32v7-$(cat sickrage/version.txt) $CONTAINER_IMAGE:arm32v7:latest
- docker tag $CONTAINER_IMAGE:arm32v7-$(cat sickrage/version.txt) $CONTAINER_IMAGE:arm32v7-latest
- docker push $CONTAINER_IMAGE:arm32v7-$(cat sickrage/version.txt)
- docker push $CONTAINER_IMAGE:arm32v7-latest
only:
......
......@@ -252,7 +252,6 @@ module.exports = function (grunt) {
const newVersion = vArray.vMajor + '.' + vArray.vMinor + '.' + vArray.vPatch + '.dev' + vArray.vPre;
grunt.config('new_version', newVersion);
grunt.file.write(vFile, newVersion);
grunt.log.writeln(('Packaging Pre-Release v' + newVersion).magenta);
......@@ -262,7 +261,7 @@ module.exports = function (grunt) {
'webpack:dev',
//'sync_trans',
'exec:git_commit:Pre-Release v' + newVersion,
//'exec:git_last_tag', 'exec:git_list_changes', 'exec:git_tag',
'exec:git_last_tag', 'exec:git_list_changes', 'exec:git_tag',
'exec:git_push:origin:develop:tags',
'exec:pypi_create',
'exec:pypi_upload',
......@@ -290,7 +289,6 @@ module.exports = function (grunt) {
}
const newVersion = vArray.vMajor + '.' + vArray.vMinor + '.' + vArray.vPatch;
grunt.config('new_version', newVersion);
grunt.file.write(vFile, newVersion);
......
# Changelog
- * edd628975 - 2019-07-09: Fixed issue with post-processing and logging downloads to history when unable to determine provider result came from.
- * 134fcfe23 - 2019-07-09: Fixed typo in container name
- * 8aa49580f - 2019-07-08: Turned on tagging for develop branch to assist gitlab ci/cd builds.
- * 42aec5573 - 2019-07-08: Release v9.4.116
- * 8f08c10c2 - 2019-07-08: Release v9.4.115
- * b0731df15 - 2019-07-08: Release v9.4.114
- * f369fde9f - 2019-07-08: Release v9.4.113
......
......@@ -160,7 +160,7 @@ class History:
:param version: Version of file (defaults to -1)
"""
provider = ''
provider = 'unknown'
dbData = session.query(MainDB.History).filter(MainDB.History.resource.contains(os.path.basename(filename).rpartition(".")[0])).first()
if dbData:
......
9.4.116
\ No newline at end of file
9.4.117
\ 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