From 3ef782f60bf91b2f6b16d9968e2b28807ea80427 Mon Sep 17 00:00:00 2001 From: relan Date: Sun, 13 Dec 2020 22:21:15 +0300 Subject: [PATCH] Update Fennec F-Droid to 84.1.0 --- metadata/org.mozilla.fennec_fdroid.yml | 48 ++++++++++++++++++++++++-- srclibs/MozAppServices.yml | 3 ++ 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/metadata/org.mozilla.fennec_fdroid.yml b/metadata/org.mozilla.fennec_fdroid.yml index c9032081bc..ee9a69cb8c 100644 --- a/metadata/org.mozilla.fennec_fdroid.yml +++ b/metadata/org.mozilla.fennec_fdroid.yml @@ -10872,6 +10872,50 @@ Builds: build: $$MozBuild$$/build.sh ndk: r21d + - versionName: 84.1.0 + versionCode: 841000 + commit: v84.1.0 + timeout: 14400 + sudo: + - apt-get update || apt-get update + - apt-get install -y g++ python-setuptools tcl gyp ninja-build libffi-dev libsqlite3-dev + llvm-6.0 + output: app/build/outputs/apk/release/app-*-release-unsigned.apk + srclibs: + - MozAndroidComponents@v67.0.11 + - MozAndroidComponentsAS@v63.0.0 + - MozAppServices@v67.0.0 + - MozBuild@64881f66e4268c81dac96fde42b1c7c1039a95b2 + - MozFennec@FIREFOX_84_0_BUILD3 + - MozGlean@v33.0.4 + - pyenv@v1.2.21 + - rustup@1.23.1 + prebuild: $$MozBuild$$/prebuild.sh $$VERSION$$ $$VERCODE$$ + build: $$MozBuild$$/build.sh + ndk: r21d + + - versionName: 84.1.0 + versionCode: 841020 + commit: v84.1.0 + timeout: 14400 + sudo: + - apt-get update || apt-get update + - apt-get install -y g++ python-setuptools tcl gyp ninja-build libffi-dev libsqlite3-dev + llvm-6.0 + output: app/build/outputs/apk/release/app-*-release-unsigned.apk + srclibs: + - MozAndroidComponents@v67.0.11 + - MozAndroidComponentsAS@v63.0.0 + - MozAppServices@v67.0.0 + - MozBuild@64881f66e4268c81dac96fde42b1c7c1039a95b2 + - MozFennec@FIREFOX_84_0_BUILD3 + - MozGlean@v33.0.4 + - pyenv@v1.2.21 + - rustup@1.23.1 + prebuild: $$MozBuild$$/prebuild.sh $$VERSION$$ $$VERCODE$$ + build: $$MozBuild$$/build.sh + ndk: r21d + MaintainerNotes: |4- Version code scheme: @@ -10890,5 +10934,5 @@ MaintainerNotes: |4- ArchivePolicy: 4 versions AutoUpdateMode: None UpdateCheckMode: None -CurrentVersion: 83.1.0 -CurrentVersionCode: 831020 +CurrentVersion: 84.1.0 +CurrentVersionCode: 841020 diff --git a/srclibs/MozAppServices.yml b/srclibs/MozAppServices.yml index 5c67dfcda0..a49fa54fb7 100644 --- a/srclibs/MozAppServices.yml +++ b/srclibs/MozAppServices.yml @@ -1,2 +1,5 @@ RepoType: git Repo: https://github.com/mozilla/application-services.git + +Prepare: | + git submodule update --init