[tor-commits] [Git][tpo/applications/fenix][tor-browser-81.1.1-10.0-1] 2 commits: Pin CI builds to runners with 32GB of RAM to avoid OOM conditions.

[Georg Koppen (owner)]

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-projects/
     # https://github.com/docker-library/openjdk/blob/master/8/jdk/buster/Dockerfile
     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/a10c5bcd49466f1e4f7a9c394b02a71dffa1cbb6...7b11da2715b70282eefe8a30ca7aea6a86e9186c

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/compare/a10c5bcd49466f1e4f7a9c394b02a71dffa1cbb6...7b11da2715b70282eefe8a30ca7aea6a86e9186c
You're receiving this email because of your account on gitlab.torproject.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tor-commits/attachments/20200921/2f3a2d68/attachment.htm>