- tbb-commits - lists.torproject.org

[tor-browser-build/maint-11.0] Bug 40402: Use /bin/bash in list_toolchain_updates
by sysrqb＠torproject.org 03 Feb '22

03 Feb '22

commit 291994127cecdbd69231788f89b3cf0db5788ea7 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 15 09:48:38 2021 +0000 Bug 40402: Use /bin/bash in list_toolchain_updates See: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/merge_re… for the issue we hit. --- projects/common/list_toolchain_updates | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/common/list_toolchain_updates b/projects/common/list_toolchain_updates index 4cfd829..ebbfe6e 100644 --- a/projects/common/list_toolchain_updates +++ b/projects/common/list_toolchain_updates @@ -1,4 +1,4 @@ -#!/usr/bin/bash +#!/bin/bash set -e

1 0

[tor-browser-build/maint-11.0] Bug 40367: Switch to bullseye for android builds
by sysrqb＠torproject.org 03 Feb '22

03 Feb '22

commit a893611f34242e8e421562054fbdeb1b5446334c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Sep 24 16:04:27 2021 +0200 Bug 40367: Switch to bullseye for android builds --- projects/android-toolchain/config | 2 +- projects/ninja/build | 2 +- projects/node/config | 4 ++++ projects/nss/build | 5 ++++- projects/nss/config | 1 + projects/nss/use-python3.patch | 12 ++++++++++++ rbm.conf | 6 +++--- 7 files changed, 26 insertions(+), 6 deletions(-) diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config index 5196528..0689bd2 100644 --- a/projects/android-toolchain/config +++ b/projects/android-toolchain/config @@ -9,7 +9,7 @@ var: use_container: 1 deps: - unzip - - python + - python3 setup: | mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf $rootdir/[% c("compiler_tarfile") %] diff --git a/projects/ninja/build b/projects/ninja/build index 527f1b6..57aac77 100644 --- a/projects/ninja/build +++ b/projects/ninja/build @@ -10,7 +10,7 @@ mkdir /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] -[% IF c("var/windows") || c("var/osx") -%] +[% IF !c("var/linux") -%] # Starting with Debian Bullseye, /usr/bin/python does not exist, so # we need to use python3 explicitly sed -i 's/env python$/env python3/' configure.py diff --git a/projects/node/config b/projects/node/config index 300e59c..0dfa76c 100644 --- a/projects/node/config +++ b/projects/node/config @@ -16,6 +16,10 @@ targets: var: arch_deps: - python2 + android: + var: + arch_deps: + - python2 input_files: - project: container-image diff --git a/projects/nss/build b/projects/nss/build index 786eec4..f7e962e 100644 --- a/projects/nss/build +++ b/projects/nss/build @@ -44,6 +44,8 @@ patch -p2 < $rootdir/config.patch # side. patch -p2 < $rootdir/bug_13028.patch +patch -p1 < $rootdir/use-python3.patch + # Building NSPR mkdir $builddir/nspr_build cd $builddir/nspr_build @@ -72,7 +74,8 @@ gyp -f ninja-android "$builddir/nss/nss.gyp" \ -Dsign_libs=0 \ -Denable_sslkeylogfile=0 \ -Ddisable_tests=1 \ - -Ddisable_libpkix=1 + -Ddisable_libpkix=1 \ + -Dpython=python3 gendir="$builddir/nss/out/Release" ninja -C "$gendir" diff --git a/projects/nss/config b/projects/nss/config index 0224dca..0da66d1 100644 --- a/projects/nss/config +++ b/projects/nss/config @@ -23,3 +23,4 @@ input_files: - filename: configure.patch - filename: config.patch - filename: bug_13028.patch + - filename: use-python3.patch diff --git a/projects/nss/use-python3.patch b/projects/nss/use-python3.patch new file mode 100644 index 0000000..4046dea --- /dev/null +++ b/projects/nss/use-python3.patch @@ -0,0 +1,12 @@ +diff -ru nss-3.65/nss/lib/ckfw/builtins/builtins.gyp nss-3.65.n/nss/lib/ckfw/builtins/builtins.gyp +--- nss-3.65/nss/lib/ckfw/builtins/builtins.gyp 2021-09-29 12:48:34.982000000 +0200 ++++ nss-3.65.n/nss/lib/ckfw/builtins/builtins.gyp 2021-09-29 12:48:43.152000000 +0200 +@@ -30,7 +30,7 @@ + { + 'msvs_cygwin_shell': 0, + 'action': [ +- 'python', ++ 'python3', + 'certdata.py', + 'certdata.txt', + '<@(_outputs)', diff --git a/rbm.conf b/rbm.conf index 5fead9d..34d503f 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,12 +24,13 @@ steps: output_dir: "out/[% project %]/cargo_vendor" var: container: - suite: buster + suite: bullseye arch: amd64 pre_pkginst: '' deps: - cargo - patch + - bzip2 cargo_vendor: | #!/bin/bash [% c("var/set_default_env") %] @@ -307,14 +308,13 @@ targets: # This is needed to get the offline build part for Glean right. glean_parser: 1.29.0 container: - suite: buster + suite: bullseye arch: amd64 disable_network: # Disable network in the script for merging GeckoView .aar files merge_aars: 1 deps: - build-essential - - python - python3 - python3-distutils - automake

1 0

[tor-browser-build/maint-11.0] Bug 40391: Fix clang config
by sysrqb＠torproject.org 03 Feb '22

03 Feb '22

commit 163f9a33bc02d2a70fdd134c390094ff5317c01c Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 8 09:13:30 2021 +0000 Bug 40391: Fix clang config --- projects/clang/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/clang/config b/projects/clang/config index 11ea039..aeefc7a 100644 --- a/projects/clang/config +++ b/projects/clang/config @@ -14,7 +14,7 @@ input_files: enable: '[% c("var/linux") %]' - name: binutils project: binutils - enable: '[% c("var/linux") %] || [% c("var/android") %]' + enable: '[% c("var/linux") || c("var/android") %]' - project: cmake name: cmake - project: llvm-project

1 0

[tor-browser-build/maint-11.0] Bug 40395: Update how we check node version in list_toolchain_updates_checks
by sysrqb＠torproject.org 03 Feb '22

03 Feb '22

commit a720689f260ca25c417faa09a9c285acf86671f7 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Dec 10 12:42:01 2021 +0100 Bug 40395: Update how we check node version in list_toolchain_updates_checks --- projects/firefox/list_toolchain_updates_checks | 28 ++++++++++++++++++++---- projects/geckoview/list_toolchain_updates_checks | 28 ++++++++++++++++++++---- 2 files changed, 48 insertions(+), 8 deletions(-) diff --git a/projects/firefox/list_toolchain_updates_checks b/projects/firefox/list_toolchain_updates_checks index a308468..26ee3a0 100644 --- a/projects/firefox/list_toolchain_updates_checks +++ b/projects/firefox/list_toolchain_updates_checks @@ -89,12 +89,32 @@ check_update_needed clang "$needed" "$current" # node read -d '' p << 'EOF' || true -if (m/^\\s*NODE_MIN_VERSION\\s*=\\s*StrictVersion\$"([^"]+)"\$/) { - print $1; - exit; +sub l { + ref $_[0] eq 'ARRAY' ? $_[0] : [ $_[0] ]; } + +my $d = YAML::XS::LoadFile('taskcluster/ci/toolchain/node.yml'); +my $node_toolchain; +T: foreach my $t (keys %$d) { + foreach my $alias (@{l($d->{$t}{run}{'toolchain-alias'})}) { + if ($alias eq 'linux64-node') { + foreach my $fetch (@{$d->{$t}{fetches}{fetch}}) { + if ($fetch =~ m/^nodejs-.*/) { + $node_toolchain = $fetch; + last T; + } + } + } + } +} + +exit 1 unless $node_toolchain; + +my $fetch = YAML::XS::LoadFile('taskcluster/ci/fetch/toolchains.yml'); +my ($version) = $fetch->{$node_toolchain}{fetch}{url} =~ m|^https://nodejs.org/dist/v([^/]+)/|; +print "$version\\n"; EOF -needed=$(cat python/mozbuild/mozbuild/nodeutil.py | perl -ne "$p") +needed=$(perl -MYAML::XS -e "$p") current='[% pc("node", "version") %]' check_update_needed node "$needed" "$current" diff --git a/projects/geckoview/list_toolchain_updates_checks b/projects/geckoview/list_toolchain_updates_checks index f31fa51..fef9756 100644 --- a/projects/geckoview/list_toolchain_updates_checks +++ b/projects/geckoview/list_toolchain_updates_checks @@ -180,12 +180,32 @@ check_update_needed clang "$needed" "$current" # node read -d '' p << 'EOF' || true -if (m/^\\s*NODE_MIN_VERSION\\s*=\\s*StrictVersion\$"([^"]+)"\$/) { - print $1; - exit; +sub l { + ref $_[0] eq 'ARRAY' ? $_[0] : [ $_[0] ]; } + +my $d = YAML::XS::LoadFile('taskcluster/ci/toolchain/node.yml'); +my $node_toolchain; +T: foreach my $t (keys %$d) { + foreach my $alias (@{l($d->{$t}{run}{'toolchain-alias'})}) { + if ($alias eq 'linux64-node') { + foreach my $fetch (@{$d->{$t}{fetches}{fetch}}) { + if ($fetch =~ m/^nodejs-.*/) { + $node_toolchain = $fetch; + last T; + } + } + } + } +} + +exit 1 unless $node_toolchain; + +my $fetch = YAML::XS::LoadFile('taskcluster/ci/fetch/toolchains.yml'); +my ($version) = $fetch->{$node_toolchain}{fetch}{url} =~ m|^https://nodejs.org/dist/v([^/]+)/|; +print "$version\\n"; EOF -needed=$(cat python/mozbuild/mozbuild/nodeutil.py | perl -ne "$p") +needed=$(perl -MYAML::XS -e "$p") current='[% pc("node", "version") %]' check_update_needed node "$needed" "$current"

1 0

[tor-browser-build/maint-11.0] Bug 40373: install ndk to $SDK_HOME/ndk
by sysrqb＠torproject.org 03 Feb '22

03 Feb '22

commit 97826538688645a4d12e556838131dfefa256666 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Oct 15 12:58:28 2021 +0200 Bug 40373: install ndk to $SDK_HOME/ndk New Android Gradle Plugin versions ignore the ANDROID_NDK_HOME environment variable, and expect to find the NDK in directory $SDK_HOME/ndk. --- projects/android-toolchain/build | 2 +- projects/android-toolchain/config | 2 +- projects/geckoview/mozconfig-android-aarch64 | 2 +- projects/geckoview/mozconfig-android-armv7 | 2 +- projects/geckoview/mozconfig-android-x86 | 2 +- projects/geckoview/mozconfig-android-x86_64 | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build index a164fc1..6cd9626 100644 --- a/projects/android-toolchain/build +++ b/projects/android-toolchain/build @@ -2,7 +2,7 @@ [% c("var/set_default_env") -%] export PROJECT_PATH=/var/tmp/dist/[% project %] export SDK_HOME=$PROJECT_PATH/android-sdk-linux -export NDK_HOME=$PROJECT_PATH/android-ndk +export NDK_HOME=$SDK_HOME/ndk android_release_dir_9=android-9 android_release_dir_10=android-10 android_release_dir_11=android-11 diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config index 08e14f6..76bb98e 100644 --- a/projects/android-toolchain/config +++ b/projects/android-toolchain/config @@ -17,7 +17,7 @@ var: # By default we use the old NDK which is the one GeckoView is using. # However, we can overwrite that per project if needed (e.g. # application-services is currently on a newer NDK). - export ANDROID_NDK_HOME=/var/tmp/dist/[% project %]/android-ndk/android-ndk-r[% c("var/android_ndk_version") %][% c("var/android_ndk_revision") %] + export ANDROID_NDK_HOME=$ANDROID_SDK_HOME/ndk/android-ndk-r[% c("var/android_ndk_version") %][% c("var/android_ndk_revision") %] export ANDROID_NDK_ROOT=$ANDROID_NDK_HOME export ANDROID_NDK_API_VERSION=[% c("var/android_ndk_version") %][% c('var/android_ndk_revision') %] export NDK_HOST_TAG=linux-x86_64 diff --git a/projects/geckoview/mozconfig-android-aarch64 b/projects/geckoview/mozconfig-android-aarch64 index 4762a10..e2f9553 100644 --- a/projects/geckoview/mozconfig-android-aarch64 +++ b/projects/geckoview/mozconfig-android-aarch64 @@ -12,7 +12,7 @@ ac_add_options --enable-official-branding ac_add_options --enable-application=mobile/android ac_add_options --target=aarch64-linux-android -ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk/android-ndk-r21d +ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-sdk-linux/ndk/android-ndk-r21d ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle/bin/gradle diff --git a/projects/geckoview/mozconfig-android-armv7 b/projects/geckoview/mozconfig-android-armv7 index 5fdcffc..5feea4e 100644 --- a/projects/geckoview/mozconfig-android-armv7 +++ b/projects/geckoview/mozconfig-android-armv7 @@ -12,7 +12,7 @@ ac_add_options --enable-official-branding ac_add_options --enable-application=mobile/android ac_add_options --target=arm-linux-androideabi -ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk/android-ndk-r21d +ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-sdk-linux/ndk/android-ndk-r21d ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle/bin/gradle diff --git a/projects/geckoview/mozconfig-android-x86 b/projects/geckoview/mozconfig-android-x86 index 294484c..44243e8 100644 --- a/projects/geckoview/mozconfig-android-x86 +++ b/projects/geckoview/mozconfig-android-x86 @@ -12,7 +12,7 @@ ac_add_options --enable-official-branding ac_add_options --enable-application=mobile/android ac_add_options --target=i686-linux-android -ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk/android-ndk-r21d +ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-sdk-linux/ndk/android-ndk-r21d ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle/bin/gradle diff --git a/projects/geckoview/mozconfig-android-x86_64 b/projects/geckoview/mozconfig-android-x86_64 index 391b0a5..12a3b93 100644 --- a/projects/geckoview/mozconfig-android-x86_64 +++ b/projects/geckoview/mozconfig-android-x86_64 @@ -12,7 +12,7 @@ ac_add_options --enable-official-branding ac_add_options --enable-application=mobile/android ac_add_options --target=x86_64-linux-android -ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk/android-ndk-r21d +ac_add_options --with-android-ndk=/var/tmp/dist/android-toolchain/android-sdk-linux/ndk/android-ndk-r21d ac_add_options --with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux ac_add_options --with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle/bin/gradle

1 0

[tor-browser-build/maint-11.0] Bug 40373: Update components for mozilla93: gradle part
by sysrqb＠torproject.org 03 Feb '22

03 Feb '22

commit c2062d739b347022a2ab3bb78fb787b07322357d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Oct 11 18:14:13 2021 +0200 Bug 40373: Update components for mozilla93: gradle part --- projects/gradle/config | 3 +++ 1 file changed, 3 insertions(+) diff --git a/projects/gradle/config b/projects/gradle/config index 8e732f5..de9b8ff 100644 --- a/projects/gradle/config +++ b/projects/gradle/config @@ -13,6 +13,9 @@ var: 6.5: 23e7d37e9bb4f8dabb8a3ea7fdee9dd0428b9b1a71d298aefd65b11dccea220f 6.5.1: 50a7d30529fa939721fe9268a0205142f3f2302bcac5fb45b27a3902e58db54a 6.6.1: 7873ed5287f47ca03549ab8dcb6dc877ac7f0e3d7b1eb12685161d10080910ac + 6.7.1: 3239b5ed86c3838a37d983ac100573f64c1f3fd8e1eb6c89fa5f9529b5ec091d + 6.9.1: 8c12154228a502b784f451179846e518733cf856efc7d45b2e6691012977b2fe + 7.0.2: 0e46229820205440b48a5501122002842b82886e76af35f0f3a069243dca4b3c input_files: - project: container-image

1 0

[tor-browser-build/maint-11.0] Bug 40372: Make the list of android components updates for switch to mozilla93-based Fenix
by sysrqb＠torproject.org 03 Feb '22

03 Feb '22

commit c78b311dc7ddb8e552b428bbf534078c9f9de4d9 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Oct 11 17:46:09 2021 +0200 Bug 40372: Make the list of android components updates for switch to mozilla93-based Fenix --- projects/android-components/config | 2 +- projects/android-components/list_toolchain_updates_checks | 2 +- projects/application-services/config | 2 +- projects/fenix/config | 2 +- projects/fenix/list_toolchain_updates_checks | 2 +- projects/geckoview/config | 3 +-- 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/projects/android-components/config b/projects/android-components/config index 0047529..b789049 100644 --- a/projects/android-components/config +++ b/projects/android-components/config @@ -58,7 +58,7 @@ input_files: steps: list_toolchain_updates: git_url: https://github.com/mozilla-mobile/android-components.git - git_hash: releases/91.0 + git_hash: releases/93.0 #tag_gpg_id: 0 var: container: diff --git a/projects/android-components/list_toolchain_updates_checks b/projects/android-components/list_toolchain_updates_checks index a46afb4..c11b9b6 100644 --- a/projects/android-components/list_toolchain_updates_checks +++ b/projects/android-components/list_toolchain_updates_checks @@ -63,7 +63,7 @@ check_update_needed glean_parser "$needed" "$current" # gradle read -d '' p << 'EOF' || true -if (m|distributionUrl=https\\\\://services.gradle.org/distributions/gradle-(.*)…) { +if (m|distributionUrl=https\\\\://services.gradle.org/distributions/gradle-(.*)…) { print $1; exit; } diff --git a/projects/application-services/config b/projects/application-services/config index c41a812..71dcb4f 100644 --- a/projects/application-services/config +++ b/projects/application-services/config @@ -90,7 +90,7 @@ input_files: steps: list_toolchain_updates: - git_hash: 'v79.0.0' + git_hash: 'v82.1.0' input_files: [] var: container: diff --git a/projects/fenix/config b/projects/fenix/config index c38ff99..f2490b0 100644 --- a/projects/fenix/config +++ b/projects/fenix/config @@ -59,7 +59,7 @@ input_files: steps: list_toolchain_updates: git_url: https://github.com/mozilla-mobile/fenix.git - git_hash: releases_v91.0.0 + git_hash: releases_v93.0.0 #tag_gpg_id: 0 input_files: [] var: diff --git a/projects/fenix/list_toolchain_updates_checks b/projects/fenix/list_toolchain_updates_checks index 1a75e28..221e7c3 100644 --- a/projects/fenix/list_toolchain_updates_checks +++ b/projects/fenix/list_toolchain_updates_checks @@ -50,7 +50,7 @@ check_update_needed minSdkVersion "$needed" "$current" # gradle read -d '' p << 'EOF' || true -if (m|distributionUrl=https\\\\://services.gradle.org/distributions/gradle-(.*)…) { +if (m|distributionUrl=https\\\\://services.gradle.org/distributions/gradle-(.*)…) { print $1; exit; } diff --git a/projects/geckoview/config b/projects/geckoview/config index 08d906f..62a499b 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -133,8 +133,7 @@ steps: list_toolchain_updates: git_url: https://github.com/mozilla/gecko-dev.git - # beta - git_hash: beta + git_hash: release tag_gpg_id: 0 input_files: [] var:

1 0

[tor-browser-build/maint-11.0] Bug 40368: Use system's python3 for android builds
by sysrqb＠torproject.org 03 Feb '22

03 Feb '22

commit 8c7df73ae6dd072709d26dcf5b3d43f291bf543a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 30 11:45:17 2021 +0200 Bug 40368: Use system's python3 for android builds --- projects/android-components/build | 1 - projects/android-components/config | 9 ++++----- projects/application-services/build | 4 ++-- projects/application-services/config | 10 +++++----- projects/fenix/build | 1 - projects/fenix/config | 8 ++++---- projects/geckoview/build | 3 +-- projects/geckoview/config | 14 +++----------- projects/glean/config | 27 ++++++++++++++------------- 9 files changed, 33 insertions(+), 44 deletions(-) diff --git a/projects/android-components/build b/projects/android-components/build index 35e3421..0500fbd 100644 --- a/projects/android-components/build +++ b/projects/android-components/build @@ -13,7 +13,6 @@ cat > get-moz-build-date << "EOF" EOF [% IF !c("var/fetch_gradle_dependencies") %] - [% pc('python', 'var/setup', { python_tarfile => c('input_files_by_name/python') }) %] tar -C $distdir -xf [% c('input_files_by_name/geckoview') %] gradle_repo=$rootdir/[% c('input_files_by_name/gradle-dependencies') %] # This overwrites the release, beta, and nightly geckoview .aar files in our diff --git a/projects/android-components/config b/projects/android-components/config index 539bd8d..0047529 100644 --- a/projects/android-components/config +++ b/projects/android-components/config @@ -17,6 +17,8 @@ var: gradle_version: 6.6.1 glean_parser: 3.4.0 git_branch: '[% project %]-[% c("var/android_components_version") %]-[% c("var/torbrowser_branch") %]-1' + arch_deps: + - python3-venv targets: nightly: @@ -39,9 +41,6 @@ input_files: - name: application-services project: application-services enable: '[% !c("var/fetch_gradle_dependencies") %]' - - name: python - project: python - enable: '[% !c("var/fetch_gradle_dependencies") %]' - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]' name: gradle-dependencies exec: '[% INCLUDE "fetch-gradle-dependencies" %]' @@ -49,9 +48,9 @@ input_files: - filename: git.patch - filename: mavenLocal.patch enable: '[% !c("var/fetch_gradle_dependencies") %]' - - URL: https://people.torproject.org/~boklm/mirrors/sources/glean-wheels-[% c('var/glean_parser') %].tar.xz + - URL: https://people.torproject.org/~boklm/mirrors/sources/glean-wheels-[% c('var/glean_parser') %]-build2.tar.xz name: glean - sha256sum: b74c9184dd2ee4c84a6e9766cd754cd07fc9be7233a1cdaa35bba6bd169beb75 + sha256sum: 6bbf3a9ffa939ca87e00b486f2020ab5cf9dea772f1d37b048f666fed38f98c1 enable: '[% !c("var/fetch_gradle_dependencies") %]' - filename: gen_gradle_deps_file.sh enable: '[% c("var/fetch_gradle_dependencies") %]' diff --git a/projects/application-services/build b/projects/application-services/build index c6e52ad..82b3350 100644 --- a/projects/application-services/build +++ b/projects/application-services/build @@ -22,7 +22,6 @@ cd $rootdir export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64 [% IF !c('var/fetch_gradle_dependencies') %] - [% pc('python', 'var/setup', { python_tarfile => c('input_files_by_name/python') }) %] gradle_repo=$rootdir/[% c('input_files_by_name/gradle-dependencies') %] cp -r $gradle_repo/dl/android/maven2/* $gradle_repo cp -r $gradle_repo/m2/* $gradle_repo @@ -75,6 +74,7 @@ patch -p1 < $rootdir/no-git.patch # XXX: We don't build the code for Linux for now as this involves additional # complexity. That's needed for running unit tests later on, though. patch -p1 < $rootdir/target.patch +export RUST_ANDROID_GRADLE_PYTHON_COMMAND=python3 [% IF c('var/fetch_gradle_dependencies') %] # XXX: `assemble` is still not enough to see all fetched dependencies via # Gradle's --debug. See: tor-browser-build#40056. @@ -83,7 +83,7 @@ patch -p1 < $rootdir/target.patch mv gradle-dependencies-list.txt '[% dest_dir _ "/" _ c("filename") %]' [% ELSE %] # Prepare Glean dependencies for offline build - tar -xf $rootdir/glean-wheels-[% c('var/glean_parser') %].tar.xz + tar -xf $rootdir/[% c('input_files_by_name/glean-wheels') %] # We need to set `LC_ALL` and `LANG` to something that is not ASCII as encoding # otherwise `click` barfs. See: https://click.palletsprojects.com/python3/ export LC_ALL=C.UTF-8 diff --git a/projects/application-services/config b/projects/application-services/config index 22bfa06..c41a812 100644 --- a/projects/application-services/config +++ b/projects/application-services/config @@ -12,6 +12,8 @@ var: gradle_dependencies_version: 6 gradle_version: 6.5 glean_parser: 2.2.0 + arch_deps: + - python3-venv input_files: - project: container-image @@ -68,15 +70,13 @@ input_files: pkg_type: build target_prepend: - android-x86_64 - - name: python - project: python - enable: '[% !c("var/fetch_gradle_dependencies") %]' - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]' name: gradle-dependencies exec: '[% INCLUDE "fetch-gradle-dependencies" %]' enable: '[% !c("var/fetch_gradle_dependencies") %]' - - URL: https://people.torproject.org/~boklm/mirrors/sources/glean-wheels-[% c('var/glean_parser') %].tar.xz - sha256sum: 24ceaaadaf155445e8ad135173d894e05c0745b41ab5fee150f9548550acf2a6 + - URL: https://people.torproject.org/~boklm/mirrors/sources/glean-wheels-[% c('var/glean_parser') %]-build2.tar.xz + name: glean-wheels + sha256sum: 75107e7f84152806fde2070d1830174919a7a2ef54c774a1925a92dd4e20d0f7 enable: '[% !c("var/fetch_gradle_dependencies") %]' # Use `make cargo_vendor-application-services` to re-generate the vendor tarball - URL: https://people.torproject.org/~boklm/mirrors/sources/application-services-v… c('version') %].tar.bz2 diff --git a/projects/fenix/build b/projects/fenix/build index 6de75cf..094b0ee 100644 --- a/projects/fenix/build +++ b/projects/fenix/build @@ -13,7 +13,6 @@ cat > get-moz-build-date << "EOF" EOF [% IF !c("var/fetch_gradle_dependencies") %] - [% pc('python', 'var/setup', { python_tarfile => c('input_files_by_name/python') }) %] tar -C $distdir -xf [% c('input_files_by_name/geckoview') %] gradle_repo=$rootdir/[% c('input_files_by_name/gradle-dependencies') %] # This overwrites the release, beta, and nightly geckoview .aar files in our diff --git a/projects/fenix/config b/projects/fenix/config index e5e0b50..c38ff99 100644 --- a/projects/fenix/config +++ b/projects/fenix/config @@ -18,6 +18,8 @@ var: gradle_dependencies_version: 32 gradle_version: 6.5.1 glean_parser: 3.4.0 + arch_deps: + - python3-venv targets: release: @@ -40,16 +42,14 @@ input_files: - name: geckoview project: geckoview pkg_type: merge_aars - - name: python - project: python - name: tba-translation project: tba-translation - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]' name: gradle-dependencies exec: '[% INCLUDE "fetch-gradle-dependencies" %]' - - URL: https://people.torproject.org/~boklm/mirrors/sources/glean-wheels-[% c('var/glean_parser') %].tar.xz + - URL: https://people.torproject.org/~boklm/mirrors/sources/glean-wheels-[% c('var/glean_parser') %]-build2.tar.xz name: glean - sha256sum: b74c9184dd2ee4c84a6e9766cd754cd07fc9be7233a1cdaa35bba6bd169beb75 + sha256sum: 6bbf3a9ffa939ca87e00b486f2020ab5cf9dea772f1d37b048f666fed38f98c1 - filename: mavenLocal.patch - project: tor-android-service name: tor-android-service diff --git a/projects/geckoview/build b/projects/geckoview/build index ab80b81..1d24213 100644 --- a/projects/geckoview/build +++ b/projects/geckoview/build @@ -17,12 +17,11 @@ EOF tar -C /var/tmp/dist -xf [% c('input_files_by_name/rust') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/cbindgen') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/nasm') %] -tar -C /var/tmp/dist -xf [% c('input_files_by_name/python') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/node') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/clang') %] export LLVM_CONFIG="/var/tmp/dist/clang/bin/llvm-config" tar -C /var/tmp/dist -xf [% c('input_files_by_name/binutils') %] -export PATH="/var/tmp/dist/rust/bin:/var/tmp/dist/cbindgen:/var/tmp/dist/nasm/bin:/var/tmp/dist/python/bin:/var/tmp/dist/node/bin:/var/tmp/dist/clang/bin:/var/tmp/dist/binutils/bin:$PATH" +export PATH="/var/tmp/dist/rust/bin:/var/tmp/dist/cbindgen:/var/tmp/dist/nasm/bin:/var/tmp/dist/node/bin:/var/tmp/dist/clang/bin:/var/tmp/dist/binutils/bin:$PATH" tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz diff --git a/projects/geckoview/config b/projects/geckoview/config index fba0d9b..08d906f 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -17,10 +17,8 @@ var: - zip - autoconf2.13 - yasm - # We are building our own version of Python 3.6, which is required - # for the build. However mach still requires Python 2.7, so we - # install this version using the package. - - python + - python3 + - python3-distutils - pkg-config container: use_container: 1 @@ -48,8 +46,7 @@ steps: EOF tar -C $distdir -xf [% c('input_files_by_name/node') %] - tar -C $distdir -xf [% c('input_files_by_name/python') %] - export PATH="/var/tmp/dist/node/bin:/var/tmp/dist/python/bin:$PATH" + export PATH="/var/tmp/dist/node/bin:$PATH" tar -C $builddir -xf [% c('input_files_by_name/geckoview_armv7') %] tar -C $builddir -xf [% c('input_files_by_name/geckoview_aarch64') %] @@ -108,9 +105,6 @@ steps: - project: node name: node pkg_type: build - - project: python - name: python - pkg_type: build - filename: mozconfig-android-all name: mozconfig - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]' @@ -170,8 +164,6 @@ input_files: name: node - project: nasm name: nasm - - project: python - name: python - project: clang name: clang - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]' diff --git a/projects/glean/config b/projects/glean/config index a1f08e4..66eb272 100644 --- a/projects/glean/config +++ b/projects/glean/config @@ -8,11 +8,22 @@ src: | #!/bin/bash mv -f [% project %]-[% c('version') %].tar.gz [% dest_dir %]/[% c('filename') %] +var: + # The `container-image` project looks at the deps list in origin_project + # in the same step (build), so we cannot put this inside the + # `create_glean_deps_tarball` step. + # rbm#40020 should allow us to fix that. + deps: + - python3 + - python3-pip + - torsocks + - xz-utils + steps: create_glean_deps_tarball: git_url: '' version: 3.4.0 - filename: 'glean-wheels-[% c("version") %].tar.xz' + filename: 'glean-wheels-[% c("version") %]-build2.tar.xz' build_log: '-' var: container: @@ -20,10 +31,11 @@ steps: create_glean_deps_tarball: | #!/bin/bash [% c("var/set_default_env") -%] - [% pc('python', 'var/setup', { python_tarfile => c('input_files_by_name/python') }) %] mkdir glean-wheels cd glean-wheels [% IF c("var/use_torsocks") %]torsocks [% END%]python3 -m pip download glean_parser==[% c("version") %] + # Get pyyaml, needed for building application-services + [% IF c("var/use_torsocks") %]torsocks [% END%]python3 -m pip download pyyaml==5.3.1 cd .. [% c('tar', { tar_src => [ 'glean-wheels' ], @@ -36,18 +48,7 @@ steps: input_files: - project: container-image pkg_type: build - - project: python - name: python - pkg_type: build targets: with_torsocks: - var: - # The `container-image` project looks at the deps list in origin_project - # in the same step (build), so we cannot put this inside the - # `create_glean_deps_tarball` step. - # rbm#40020 should allow us to fix that. - deps: - - torsocks - - xz-utils use_torsocks: 1

1 0

[tor-browser-build/maint-11.0] Bug 40373: Add android_ndk_version_build symlink
by sysrqb＠torproject.org 03 Feb '22

03 Feb '22

commit 1c0148ad0a24b425f28a36122edd3b1649819e1e Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Oct 15 13:10:10 2021 +0200 Bug 40373: Add android_ndk_version_build symlink application-services is refering to an ndk version which includes the build number, and expects a directory with this version number in the $SDK_HOME/ndk directory, so we add a symlink with that name. --- projects/android-toolchain/build | 1 + projects/android-toolchain/config | 1 + projects/application-services/list_toolchain_updates_checks | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build index 6cd9626..6fa7794 100644 --- a/projects/android-toolchain/build +++ b/projects/android-toolchain/build @@ -16,6 +16,7 @@ mkdir -p $SDK_HOME/cmdline-tools unzip -qq [% c("input_files_by_name/android_commandlinetools") %] -d $SDK_HOME/cmdline-tools mv $SDK_HOME/cmdline-tools/cmdline-tools $SDK_HOME/cmdline-tools/[% c("var/commandlinetools_version_string") %] unzip -qq [% c("input_files_by_name/android_ndk_compiler")%] -d $NDK_HOME +ln -s $NDK_HOME/android-ndk-r[% c("var/android_ndk_version") %][% c("var/android_ndk_revision") %] $NDK_HOME/[% c("var/android_ndk_version_build") %] # NDK Archive # Adjust cross compilation prefix for armv7a. Unfortunately, the compiler cross diff --git a/projects/android-toolchain/config b/projects/android-toolchain/config index 76bb98e..b854189 100644 --- a/projects/android-toolchain/config +++ b/projects/android-toolchain/config @@ -33,6 +33,7 @@ var: android_platform_revision_29: 04 android_ndk_version: 21 android_ndk_revision: d + android_ndk_version_build: 21.3.6528147 # XXX: In commit 83fffa1198c3cbeffec45028971896876e2133a5 mozilla # replaced sdk-tools with commandlinetools. We try to do the same here, # but it seems sdk-tools is still being used in the build, so we can't diff --git a/projects/application-services/list_toolchain_updates_checks b/projects/application-services/list_toolchain_updates_checks index f80eda8..2ece96a 100644 --- a/projects/application-services/list_toolchain_updates_checks +++ b/projects/application-services/list_toolchain_updates_checks @@ -8,7 +8,7 @@ if (m/^\\s*ndkVersion:\\s"([^"]*)",/) { } EOF needed=$(cat build.gradle | perl -ne "$p") -current='21.3.6528147' +current='[% pc("android-toolchain", "var/android_ndk_version_build") %]' check_update_needed ndkVersion "$needed" "$current"

1 0

[tor-browser-build/maint-11.0] Bug 40373: Update components for mozilla93: fenix part
by sysrqb＠torproject.org 03 Feb '22

03 Feb '22

commit 29a62fb97375d3a31861c99ad558556bef95cfcd Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Oct 27 10:38:12 2021 +0200 Bug 40373: Update components for mozilla93: fenix part --- projects/fenix/config | 2 +- projects/fenix/list_toolchain_updates_checks | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/fenix/config b/projects/fenix/config index f2490b0..5e74ba0 100644 --- a/projects/fenix/config +++ b/projects/fenix/config @@ -16,7 +16,7 @@ var: use_container: 1 # This should be updated when the list of gradle dependencies is changed. gradle_dependencies_version: 32 - gradle_version: 6.5.1 + gradle_version: 7.0.2 glean_parser: 3.4.0 arch_deps: - python3-venv diff --git a/projects/fenix/list_toolchain_updates_checks b/projects/fenix/list_toolchain_updates_checks index 221e7c3..50e8a92 100644 --- a/projects/fenix/list_toolchain_updates_checks +++ b/projects/fenix/list_toolchain_updates_checks @@ -68,6 +68,6 @@ if (m/const\\s+val\\s+android_gradle_plugin\\s+=\\s+"([^"]+)"/) { } EOF needed=$(cat buildSrc/src/main/java/Dependencies.kt | perl -ne "$p") -current='4.0.1' +current='7.0.0' check_update_needed android-gradle-plugin "$needed" "$current"

1 0