
Pier Angelo Vendrame pushed to branch tor-browser-140.0a1-15.0-2 at The Tor Project / Applications / Tor Browser Commits: fdae8e41 by Dan Ballard at 2025-07-08T12:55:38-07:00 fixup! TB 42669: [android] Use custom no-op app-services Fix application-services detection in tba-fetch-deps - - - - - 1 changed file: - mobile/android/fenix/tools/tba-fetch-deps.sh Changes: ===================================== mobile/android/fenix/tools/tba-fetch-deps.sh ===================================== @@ -91,8 +91,7 @@ else rm "$app_services" fi mkdir -p "$GRADLE_MAVEN_REPOSITORIES/org/mozilla" -if [ -f "$app_services" ]; then - tar -C /tmp -xf "$app_services" +if [ -d /tmp/application-services ]; then cp -r /tmp/application-services/maven/org/mozilla/* "$GRADLE_MAVEN_REPOSITORIES/org/mozilla" # Over on tor-browser-build all build tools are built for x86_64-linux. @@ -103,7 +102,7 @@ if [ -f "$app_services" ]; then # support reproducibility and are not necessary for development builds. if [ "$os" != "unknown-linux" ] || [ "$arch" != "x86_64" ]; then echo "Downloading nimbus-fml binary for $arch-$os" - app_services_version=$(echo "$app_services" | grep -oE 'application-services-[0-9]+\.[0-9]+\.[0-9]+' | grep -oE '[0-9]+\.[0-9]+\.[0-9]+') + app_services_version=$(echo "$app_services" | grep -oE 'application-services-[0-9]+\.[0-9]+(\.[0-9]{1,2})?' | grep -oE '[0-9]+\.[0-9]+(\.[0-9]{1,2})?') curl -L -o /tmp/nimbus-fml.zip "https://archive.mozilla.org/pub/app-services/releases/$app_services_version/..." unzip -d /tmp/nimbus-fml /tmp/nimbus-fml.zip View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/fdae8e41... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/fdae8e41... You're receiving this email because of your account on gitlab.torproject.org.
participants (1)
-
Pier Angelo Vendrame (@pierov)