boklm pushed to branch main at The Tor Project / Applications / tor-browser-build

Commits: 4e92f461 by Nicolas Vigier at 2023-04-18T15:17:05+02:00 Bug 40831: Fix update URL for base-browser nightly

- - - - -

2 changed files:

- projects/firefox/build - projects/firefox/config

Changes:

===================================== projects/firefox/build ===================================== @@ -97,7 +97,7 @@ fi cp $rootdir/marsigner.der toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der [% ELSIF c("var/nightly") && ! c("var/mullvad-browser") -%] # Set update url for nightly (#33402 / #40033) - sed -i 's|^URL=https://aus1%5C.torproject%5C.org/.*%7CURL=https://nightlies.tbb.torproject.... c("var/nightly_updates_publish_dir") %]/%CHANNEL%/%BUILD_TARGET%/%VERSION%/ALL|' build/application.ini.in + sed -i 's|^URL=https://aus1%5C.torproject%5C.org/.*%7CURL=https://nightlies.tbb.torproject.... 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: 2 branding_directory_prefix: 'tb' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' - nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %][% c("var/osname") %]' + nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]nightly-[% c("var/osname") %]' gitlab_project: https://gitlab.torproject.org/tpo/applications/tor-browser git_commit: '[% exec("git rev-parse HEAD") %]' deps: @@ -133,7 +133,7 @@ targets: macos: var: martools_filename: 'mar-tools-macos-[% c("var/macos_arch") %].zip' - nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]macos' + nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]nightly-macos' arch_deps: - python3 - python3-distutils

View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4e...