July 2025 - tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser-build][main] Bug 41499: Copy artifacts when releasing tor browser
by boklm (＠boklm) 08 Jul '25

08 Jul '25

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 095e29b4 by Beatriz Rizental at 2025-07-08T13:01:39+02:00 Bug 41499: Copy artifacts when releasing tor browser Co-authored-by: Nicolas Vigier <boklm(a)torproject.org> - - - - - 3 changed files: - projects/browser/build.android - projects/geckoview/build_apk - projects/release/build Changes: ===================================== projects/browser/build.android ===================================== @@ -121,6 +121,6 @@ apksigner sign --verbose --min-sdk-version [% c("var/android_min_api") %] --ks $ [% END -%] [% IF c("var/nightly") -%] - # mkdir -p "[% dest_dir %]/[% c('filename') %]/artifacts" - # cp -r $rootdir/[% c('input_files_by_name/fenix') %]/artifacts [% dest_dir %]/[% c('filename') %] + mkdir -p "[% dest_dir %]/[% c('filename') %]/artifacts/" + mv $rootdir/[% c('input_files_by_name/fenix') %]/geckoview/artifacts/[% c("var/abi") %] [% dest_dir %]/[% c('filename') %]/artifacts [% END %] ===================================== projects/geckoview/build_apk ===================================== @@ -5,6 +5,19 @@ echo "Starting the creation of the fat AAR $(date)" tar -C $builddir -xf [% project %]-[% c('version') %].tar.[% c('compress_tar') %] +mkdir -p $outdir/[% project %]/artifacts + +[% IF c("var/nightly") -%] + mkdir -p $outdir/[% project %]/artifacts/armeabi-v7a + mv $rootdir/[% c('input_files_by_name/geckoview_armv7') %]/artifacts/* $outdir/[% project %]/artifacts/armeabi-v7a + mkdir -p $outdir/[% project %]/artifacts/arm64-v8a + mv $rootdir/[% c('input_files_by_name/geckoview_aarch64') %]/artifacts/* $outdir/[% project %]/artifacts/arm64-v8a + mkdir -p $outdir/[% project %]/artifacts/x86 + mv $rootdir/[% c('input_files_by_name/geckoview_x86') %]/artifacts/* $outdir/[% project %]/artifacts/x86 + mkdir -p $outdir/[% project %]/artifacts/x86_64 + mv $rootdir/[% c('input_files_by_name/geckoview_x86_64') %]/artifacts/* $outdir/[% project %]/artifacts/x86_64 +[% END -%] + # Specify the architectures we want to merge export MOZ_ANDROID_FAT_AAR_ARCHITECTURES=armeabi-v7a,arm64-v8a,x86,x86_64 export MOZ_ANDROID_FAT_AAR_ARMEABI_V7A=$rootdir/[% c('input_files_by_name/geckoview_armv7') %]/geckoview/*.aar ===================================== projects/release/build ===================================== @@ -1,53 +1,65 @@ -#!/bin/sh +#!/bin/bash [% c("var/set_default_env") -%] # reset HOME which was changed by var/set_default_env, for gpg [% IF ENV.HOME %]export HOME="[% ENV.HOME %]"[% END %] destdir="[% dest_dir _ '/' _ c("var/publish_dir") %]" mkdir -p "$destdir" + +function mv_files { + inputfile="$1" + if test -d "$inputfile"/artifacts + then + mkdir -p "$destdir"/artifacts + mv "$inputfile"/artifacts/* "$destdir"/artifacts + rmdir "$inputfile"/artifacts + fi + mv "$inputfile"/* "$destdir"/ +} + [% IF c("var/browser_platforms/android-armv7") -%] - mv [% c('input_files_by_name/android-armv7') %]/* "$destdir"/ + mv_files "[% c('input_files_by_name/android-armv7') %]" [% END -%] [% IF c("var/browser_platforms/android-x86") -%] - mv [% c('input_files_by_name/android-x86') %]/* "$destdir"/ + mv_files "[% c('input_files_by_name/android-x86') %]" [% END -%] [% IF c("var/browser_platforms/android-x86_64") -%] - mv [% c('input_files_by_name/android-x86_64') %]/* "$destdir"/ + mv_files "[% c('input_files_by_name/android-x86_64') %]" [% END -%] [% IF c("var/browser_platforms/android-aarch64") -%] - mv [% c('input_files_by_name/android-aarch64') %]/* "$destdir"/ + mv_files "[% c('input_files_by_name/android-aarch64') %]" [% END -%] [% IF c("var/browser_platforms/windows-i686") -%] - mv [% c('input_files_by_name/windows-i686') %]/* "$destdir"/ + mv_files "[% c('input_files_by_name/windows-i686') %]" [% END -%] [% IF c("var/browser_platforms/windows-x86_64") -%] - mv [% c('input_files_by_name/windows-x86_64') %]/* "$destdir"/ + mv_files "[% c('input_files_by_name/windows-x86_64') %]" [% END -%] [% IF c("var/browser_platforms/macos") -%] - mv [% c('input_files_by_name/macos') %]/* "$destdir"/ + mv_files "[% c('input_files_by_name/macos') %]" [% END -%] [% IF c("var/browser_platforms/macos-x86_64") -%] - mv [% c('input_files_by_name/macos-x86_64') %]/* "$destdir"/ + mv_files "[% c('input_files_by_name/macos-x86_64') %]" [% END -%] [% IF c("var/browser_platforms/macos-aarch64") -%] - mv [% c('input_files_by_name/macos-aarch64') %]/* "$destdir"/ + mv_files "[% c('input_files_by_name/macos-aarch64') %]" [% END -%] [% IF c("var/browser_platforms/linux-i686") -%] - mv [% c('input_files_by_name/linux-i686') %]/* "$destdir"/ + mv_files "[% c('input_files_by_name/linux-i686') %]" [% END -%] [% IF c("var/browser_platforms/linux-x86_64") -%] - mv [% c('input_files_by_name/linux-x86_64') %]/* "$destdir"/ + mv_files "[% c('input_files_by_name/linux-x86_64') %]" [% END -%] [% IF c("var/browser_platforms/linux-aarch64") -%] - mv [% c('input_files_by_name/linux-aarch64') %]/* "$destdir"/ + mv_files "[% c('input_files_by_name/linux-aarch64') %]" [% END -%] [% IF c("var/linux-packages") || c("var/linux-packages-aarch64") -%] [% IF c("var/linux-packages") -%] - mv [% c('input_files_by_name/deb-packages') %]/* "$destdir"/ + mv_files "[% c('input_files_by_name/deb-packages') %]" [% END -%] [% IF c("var/linux-packages-aarch64") -%] - mv [% c('input_files_by_name/deb-packages-aarch64') %]/* "$destdir"/ + mv_files "[% c('input_files_by_name/deb-packages-aarch64') %]" [% END -%] - mv [% c('input_files_by_name/rpm-packages') %]/* "$destdir"/ + mv_files "[% c('input_files_by_name/rpm-packages') %]" [% END -%] [% IF c("var/browser-src") -%] mv [% c('input_files_by_name/src-firefox') %] \ View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41502: Bump Application Services to build2.
by Pier Angelo Vendrame (＠pierov) 07 Jul '25

07 Jul '25

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 971557c8 by Pier Angelo Vendrame at 2025-07-07T18:49:39+02:00 Bug 41502: Bump Application Services to build2. - - - - - 1 changed file: - projects/application-services/config Changes: ===================================== projects/application-services/config ===================================== @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 version: 140.0 -git_hash: 'v[% c("version") %]-TORBROWSER' +git_hash: 'v[% c("version") %]-TORBROWSER-build[% c("var/build_number") %]' git_url: https://gitlab.torproject.org/tpo/applications/application-services.git tag_gpg_id: 1 gpg_keyring: @@ -16,6 +16,7 @@ container: use_container: 1 var: + build_number: 2 # This should be updated when the list of gradle dependencies is changed. gradle_dependencies_version: 12 gradle_version: 8.13 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/9… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/9… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new branch tor-browser-140.0esr-15.0-1
by Pier Angelo Vendrame (＠pierov) 07 Jul '25

07 Jul '25

Pier Angelo Vendrame pushed new branch tor-browser-140.0esr-15.0-1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/tor-brows… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser] Pushed new tag FIREFOX_140_0esr_RELEASE
by Pier Angelo Vendrame (＠pierov) 07 Jul '25

07 Jul '25

Pier Angelo Vendrame pushed new tag FIREFOX_140_0esr_RELEASE at The Tor Project / Applications / Mullvad Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/FIREF… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag FIREFOX_140_0esr_RELEASE
by Pier Angelo Vendrame (＠pierov) 07 Jul '25

07 Jul '25

Pier Angelo Vendrame pushed new tag FIREFOX_140_0esr_RELEASE at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/FIREFOX_1… You're receiving this email because of your account on gitlab.torproject.org.

1 0