boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 08adc57a by Nicolas Vigier at 2023-03-10T15:47:38+01:00 Bug 40808: Set update URL for nightly base-browser - - - - - 2 changed files: - projects/firefox/build - projects/firefox/config Changes: ===================================== projects/firefox/build ===================================== @@ -92,9 +92,9 @@ fi popd [% END %] -[% IF c("var/nightly") && c("var/tor-browser") -%] +[% IF c("var/nightly") && ! c("var/privacy-browser") -%] # Set update url for nightly (#33402 / #40033) - sed -i 's|^URL=https://aus1\.torproject\.org/.*|URL=https://nightlies.tbb.torproject.org/nightly-updates/updates/nightly-[% c("var/nightly_updates_osname") %]/%CHANNEL%/%BUILD_TARGET%/%VERSION%/ALL|' build/application.ini.in + sed -i 's|^URL=https://aus1\.torproject\.org/.*|URL=https://nightlies.tbb.torproject.org/nightly-updates/updates/nightly-[% c("var/nightly_updates_publish_dir") %]/%CHANNEL%/%BUILD_TARGET%/%VERSION%/ALL|' build/application.ini.in [% END -%] ===================================== projects/firefox/config ===================================== @@ -18,7 +18,7 @@ var: browser_build: 3 branding_directory_prefix: 'tb' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' - nightly_updates_osname: '[% c("var/osname") %]' + nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %][% c("var/osname") %]' gitlab_project: https://gitlab.torproject.org/tpo/applications/tor-browser git_commit: '[% exec("git rev-parse HEAD") %]' deps: @@ -68,6 +68,8 @@ targets: basebrowser: # basebrowser tag always has a -build1 suffix git_hash: '[% c("var/project-name") %]-[% c("var/firefox_version") %]-[% c("var/browser_branch") %]-build1' + var: + nightly_updates_publish_dir_prefix: basebrowser- nightly: git_hash: '[% c("var/project-name") %]-[% c("var/firefox_version") %]-[% c("var/browser_branch") %]' @@ -122,7 +124,7 @@ targets: macos: var: martools_filename: 'mar-tools-macos-[% c("var/macos_arch") %].zip' - nightly_updates_osname: macos + nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]macos' arch_deps: - python3 - python3-distutils View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/08... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/08... You're receiving this email because of your account on gitlab.torproject.org.