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
2 changed files:
Changes:
| ... | ... | @@ -92,9 +92,9 @@ fi |
| 92 | 92 | popd
|
| 93 | 93 | [% END %]
|
| 94 | 94 | |
| 95 | -[% IF c("var/nightly") && c("var/tor-browser") -%]
|
|
| 95 | +[% IF c("var/nightly") && ! c("var/privacy-browser") -%]
|
|
| 96 | 96 | # Set update url for nightly (#33402 / #40033)
|
| 97 | - 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
|
|
| 97 | + 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
|
|
| 98 | 98 | [% END -%]
|
| 99 | 99 | |
| 100 | 100 |
| ... | ... | @@ -18,7 +18,7 @@ var: |
| 18 | 18 | browser_build: 3
|
| 19 | 19 | branding_directory_prefix: 'tb'
|
| 20 | 20 | copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
|
| 21 | - nightly_updates_osname: '[% c("var/osname") %]'
|
|
| 21 | + nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %][% 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:
|
| ... | ... | @@ -68,6 +68,8 @@ targets: |
| 68 | 68 | basebrowser:
|
| 69 | 69 | # basebrowser tag always has a -build1 suffix
|
| 70 | 70 | git_hash: '[% c("var/project-name") %]-[% c("var/firefox_version") %]-[% c("var/browser_branch") %]-build1'
|
| 71 | + var:
|
|
| 72 | + nightly_updates_publish_dir_prefix: basebrowser-
|
|
| 71 | 73 | |
| 72 | 74 | nightly:
|
| 73 | 75 | git_hash: '[% c("var/project-name") %]-[% c("var/firefox_version") %]-[% c("var/browser_branch") %]'
|
| ... | ... | @@ -122,7 +124,7 @@ targets: |
| 122 | 124 | macos:
|
| 123 | 125 | var:
|
| 124 | 126 | martools_filename: 'mar-tools-macos-[% c("var/macos_arch") %].zip'
|
| 125 | - nightly_updates_osname: macos
|
|
| 127 | + nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]macos'
|
|
| 126 | 128 | arch_deps:
|
| 127 | 129 | - python3
|
| 128 | 130 | - python3-distutils
|