From d499c3a902357002d49484b1edc0c5d169f8656f Mon Sep 17 00:00:00 2001
From: Nicolas Vigier <boklm@torproject.org>
Date: Mon, 3 Oct 2022 13:16:25 +0200
Subject: [PATCH] Bug 40067: Update nightly directory for macos
---
projects/firefox/build | 2 +-
projects/firefox/config | 2 ++
tools/signing/nightly/config.yml | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/projects/firefox/build b/projects/firefox/build
index c6b940fac..724bd27b0 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 103e8a9ab..75d06ca92 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 bf1db201c..198f26c1a 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
--
GitLab