[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/tor-browser-build][main] Bug 40149: Remove patching of nightly update URL

Title: GitLab

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

Commits:

  • 0f702b2f
    by Pier Angelo Vendrame at 2023-09-06T21:21:18+02:00 
    Bug 40149: Remove patching of nightly update URL

Use a new configuration option we recently introduced.
Fixes also #40946, as we use the same option for testing purposes.

3 changed files:

Changes:

  • projects/firefox/build
    ... ... @@ -91,11 +91,7 @@ MOZCONFIG_EOF
    91 91 
     [% END -%]
    92 92
    93 93 
     [% IF c("var/override_updater_url") -%]
    94 
    -  sed -i 's|^URL="" c("var/override_updater_url") %]|' build/application.ini.in
    95 94 
       cp $rootdir/marsigner.der toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der
    96 
    -[% ELSIF c("var/nightly") && ! c("var/mullvad-browser") -%]
    97 
    -  # Set update url for nightly (#33402 / #40033)
    98 
    -  sed -i 's|^URL="" c("var/nightly_updates_publish_dir") %]/%CHANNEL%/%BUILD_TARGET%/%VERSION%/ALL|' build/application.ini.in
    99 95 
     [% END -%]
    100 96
    101 97 
     export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system

  • projects/firefox/config
    ... ... @@ -30,12 +30,15 @@ var:
    30 30 
         - yasm
    31 31 
         - pkg-config
    32 32 
       has_l10n: '[% !c("var/testbuild") && c("var/locales").size %]'
    33 
    +  # For testing purposes use override_updater_url, as it will also override the
    34 
    +  # certificate.
    35 
    +  updater_url: 'https://aus1.torproject.org/torbrowser/update_3/'
    33 36
    34 37 
       # Uncomment this if you want to test the updater. You will need to provide a
    35 38 
       # marsigner.der in this directory, too. It will be used as a replacement for
    36 39 
       # the nightly builds keys only. So, using this option for alphas and releases
    37 40 
       # will not work (the browser will fail with a key/signature mismatch).
    38 
    -  # override_updater_url: 'https://tb-build-05.torproject.org/~you/update_3/%CHANNEL%/%BUILD_TARGET%/%VERSION%/ALL'
    41 
    +  # override_updater_url: 'https://tb-build-05.torproject.org/~you/update_3/'
    39 42
    40 43 
       rezip: |
    41 44 
         rezip_tmpdir=$(mktemp -d)
    ... ... @@ -78,12 +81,15 @@ targets:
    78 81 
       nightly:
    79 82 
         git_hash: '[% c("var/project-name") %]-[% c("var/firefox_version") %]-[% c("var/browser_branch") %]'
    80 83 
         tag_gpg_id: 0
    84 
    +    var:
    85 
    +      updater_url: 'https://nightlies.tbb.torproject.org/nightly-updates/updates/[% c("var/nightly_updates_publish_dir") %]'
    81 86
    82 87 
       mullvadbrowser:
    83 88 
         git_url: https://gitlab.torproject.org/tpo/applications/mullvad-browser.git
    84 89 
         var:
    85 90 
           branding_directory_prefix: 'mb'
    86 91 
           gitlab_project: https://gitlab.torproject.org/tpo/applications/mullvad-browser
    92 
    +      updater_url: 'https://cdn.mullvad.net/browser/update_responses/update_1/'
    87 93
    88 94 
       linux-x86_64:
    89 95 
         var:

  • projects/firefox/mozconfig
    ... ... @@ -71,6 +71,11 @@
    71 71
    72 72 
     ac_add_options --[% IF c("var/updater_enabled") %]enable[% ELSE %]disable[% END %]-updater
    73 73 
     ac_add_options --[% IF c("var/updater_enabled") %]enable[% ELSE %]disable[% END %]-base-browser-update
    74 
    +[% IF c("var/override_updater_url") -%]
    75 
    +  ac_add_options --with-updater-url="" c("var/override_updater_url") %]
    76 
    +[% ELSIF c("var/updater_url")  -%]
    77 
    +  ac_add_options --with-updater-url="" c("var/updater_url") %]
    78 
    +[% END -%]
    74 79
    75 80 
     mk_add_options MOZ_PARALLEL_BUILD=[% c("num_procs") %]
    76 81

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help 

    _______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits