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
2 changed files:
Changes:
| ... | ... | @@ -97,7 +97,7 @@ fi | 
| 97 | 97 |    cp $rootdir/marsigner.der toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der
 | 
| 98 | 98 |  [% ELSIF c("var/nightly") && ! c("var/mullvad-browser") -%]
 | 
| 99 | 99 |    # Set update url for nightly (#33402 / #40033)
 | 
| 100 | - sed -i 's|^URL="" class="idiff left right deletion" style="background-color: #fac5cd;">nightly-[% c("var/nightly_updates_publish_dir") %]/%CHANNEL%/%BUILD_TARGET%/%VERSION%/ALL|' build/application.ini.in | |
| 100 | +  sed -i 's|^URL="" c("var/nightly_updates_publish_dir") %]/%CHANNEL%/%BUILD_TARGET%/%VERSION%/ALL|' build/application.ini.in
 | |
| 101 | 101 |  [% END -%]
 | 
| 102 | 102 | |
| 103 | 103 | 
| ... | ... | @@ -18,7 +18,7 @@ var: | 
| 18 | 18 |    browser_build: 2
 | 
| 19 | 19 |    branding_directory_prefix: 'tb'
 | 
| 20 | 20 |    copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
 | 
| 21 | -  nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %][% c("var/osname") %]'
 | |
| 21 | +  nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]nightly-[% c("var/osname") %]'
 | |
| 22 | 22 |    gitlab_project: https://gitlab.torproject.org/tpo/applications/tor-browser
 | 
| 23 | 23 |    git_commit: '[% exec("git rev-parse HEAD") %]'
 | 
| 24 | 24 |    deps:
 | 
| ... | ... | @@ -133,7 +133,7 @@ targets: | 
| 133 | 133 |    macos:
 | 
| 134 | 134 |      var:
 | 
| 135 | 135 |        martools_filename: 'mar-tools-macos-[% c("var/macos_arch") %].zip'
 | 
| 136 | -      nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]macos'
 | |
| 136 | +      nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]nightly-macos'
 | |
| 137 | 137 |        arch_deps:
 | 
| 138 | 138 |          - python3
 | 
| 139 | 139 |          - python3-distutils
 |