diff --git a/projects/firefox/build b/projects/firefox/build index c6b940face67c0e48d909a13a12189597ef045ef..724bd27b0d0e72cc1ba2aa73f958bb9efe81089d 100644 --- a/projects/firefox/build +++ b/projects/firefox/build @@ -100,7 +100,7 @@ fi [% IF c("var/nightly") && c("var/tor-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/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_osname") %]/%CHANNEL%/%BUILD_TARGET%/%VERSION%/ALL|' build/application.ini.in [% END -%] add_translation () { diff --git a/projects/firefox/config b/projects/firefox/config index 103e8a9abf3793b670627be2cbf3ae99d5104f0a..75d06ca92f0aa7f7f0c41bdd9f416c35577bba9a 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -16,6 +16,7 @@ var: browser_build: 1 branding_directory: 'browser/branding/alpha' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' + nightly_updates_osname: '[% c("var/osname") %]' deps: - build-essential - unzip @@ -113,6 +114,7 @@ targets: osx: var: martools_filename: 'mar-tools-mac-[% c("var/osx_arch") %].zip' + nightly_updates_osname: macos arch_deps: - python3 - python3-distutils diff --git a/tools/signing/nightly/config.yml b/tools/signing/nightly/config.yml index bf1db201c6f109e4ce0e5dc1c1c056fff5819cb9..198f26c1af5855eedb2e07d0b8ebe279a793472a 100644 --- a/tools/signing/nightly/config.yml +++ b/tools/signing/nightly/config.yml @@ -10,7 +10,7 @@ publish_dirs: - nightly-linux-i686 - nightly-windows-x86_64 - nightly-windows-i686 - - nightly-osx-x86_64 + - nightly-macos nss_db_dir: nssdb nss_certname: nightly-marsigner gpg_keyring: keyring/torbrowser-nightly.gpg