Georg Koppen (owner) pushed to branch tor-browser-81.1.1-10.0-1 at The Tor Project / Applications / fenix

Commits: e8a6f8cc by Alexander Færøy at 2020-09-18T14:07:43+00:00 Pin CI builds to runners with 32GB of RAM to avoid OOM conditions.

- - - - - 7b11da27 by Georg Koppen at 2020-09-18T14:07:43+00:00 Bug 40042: Add option do overwrite timestamp in extension version

- - - - -

2 changed files:

- .gitlab-ci.yml - app/build.gradle

Changes:

===================================== .gitlab-ci.yml ===================================== @@ -15,6 +15,8 @@ default: # See https://about.gitlab.com/blog/2018/10/24/setting-up-gitlab-ci-for-android-pr... # https://github.com/docker-library/openjdk/blob/master/8/jdk/buster/Dockerfil... image: openjdk:8-jdk + tags: + - 32GB

before_script: - set -e

===================================== app/build.gradle ===================================== @@ -678,7 +678,10 @@ ext.updateExtensionVersion = { task, extDir -> rename { 'manifest.json' } into extDir

- def values = ['version': AndroidComponents.VERSION + "." + new Date().format('MMddHHmmss')] + def systemEnvBuildDate = System.getenv('MOZ_BUILD_DATE') + def values = ['version': AndroidComponents.VERSION + "." + + (systemEnvBuildDate != null ? systemEnvBuildDate : + new Date().format('MMddHHmmss'))] inputs.properties(values) expand(values) }

View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/a10c5bcd49466...