blallo
/
fenix
1
0
Fork 0
Code Releases Activity

Bug 1580778 - Fix version names (#5635) 

* Bug 1580778 - Put back versionName to releases

* Bug 1580778 - Put quote escaping
master
Johan Lorenzo 2019-09-30 20:03:52 +02:00 committed by Sawyer Blatz
parent ef29fe2584
commit 9729fd494e
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
taskcluster/ci/build/kind.yml
View File

@ -77,6 +77,7 @@ jobs:
fennec-production:
attributes:
nightly: true
include-nightly-version: true
include-shippable-secrets: true
run:
geckoview-engine: geckoBeta
@ -88,6 +89,7 @@ jobs:
attributes:
build-type: production
release-type: beta
include-release-version: true
include-shippable-secrets: true
run:
geckoview-engine: geckoBeta
@ -99,6 +101,7 @@ jobs:
production:
attributes:
release-type: production
include-release-version: true
include-shippable-secrets: true
run:
geckoview-engine: geckoBeta

7
taskcluster/fenix_taskgraph/transforms/build.py
View File

@ -9,6 +9,7 @@ kind.
from __future__ import absolute_import, print_function, unicode_literals
import datetime
import os
from taskgraph.transforms.base import TransformSequence
from fenix_taskgraph.gradle import get_variant
@ -83,7 +84,7 @@ def add_nightly_version(config, tasks):
for task in tasks:
if task.pop("include-nightly-version", False):
task["run"]["gradlew"].append('-PversionName="{}"'.format(formated_date_time))
task["run"]["gradlew"].append('-PversionName={}'.format(formated_date_time))
yield task
@ -92,10 +93,10 @@ def add_release_version(config, tasks):
for task in tasks:
if task.pop("include-release-version", False):
# TODO Move GIT_TAG to a parameter
git_tag = os.environ['GIT_TAG']
git_tag = os.environ.get('GIT_TAG', 'vUNSET')
version = git_tag[1:] # remove prefixed "v"
task["run"]["gradlew"].append('-PversionName="{}"'.format(version))
task["run"]["gradlew"].append('-PversionName={}'.format(version))
yield task