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

[tor-commits] [Git][tpo/applications/tor-browser-build][main] Bug 40956: Allow testing the updater in the relase and alpha channel.

Title: GitLab

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build

Commits:

  • bcfb6be0
    by Pier Angelo Vendrame at 2023-09-20T17:44:17+02:00 
    Bug 40956: Allow testing the updater in the relase and alpha channel.

When override_updater_url is set we used to copy marsigner.der as the
nightly secondary key. With this commit, we check if we are building a
release or an alpha, and in case we replace the secondary release key.

Also, this commit adds a Makefile target to create incrementals and
update response configuration that uses the unsigned files.

6 changed files:

Changes:

  • Makefile
    ... ... @@ -187,6 +187,12 @@ torbrowser-incrementals-release: submodule-update
    187 187 
     	tools/update-responses/gen_incrementals release
    188 188 
     	$(rbm) build release --step hash_incrementals --target release --target torbrowser
    189 189
    190 
    +torbrowser-incrementals-release-unsigned: submodule-update
    191 
    +	$(rbm) build release --step update_responses_config --target release --target unsigned_releases_dir --target torbrowser
    192 
    +	$(rbm) build release --step link_old_mar_filenames --target release --target unsigned_releases_dir --target torbrowser
    193 
    +	NO_CODESIGNATURE=1 tools/update-responses/gen_incrementals release
    194 
    +	$(rbm) build release --step hash_incrementals --target release --target torbrowser
    195 
    +
    190 196 
     torbrowser-incrementals-alpha: submodule-update
    191 197 
     	$(rbm) build release --step update_responses_config --target alpha --target create_unsigned_incrementals --target torbrowser
    192 198 
     	tools/update-responses/download_missing_versions alpha
    ... ... @@ -194,6 +200,12 @@ torbrowser-incrementals-alpha: submodule-update
    194 200 
     	tools/update-responses/gen_incrementals alpha
    195 201 
     	$(rbm) build release --step hash_incrementals --target alpha --target torbrowser
    196 202
    203 
    +torbrowser-incrementals-alpha-unsigned: submodule-update
    204 
    +	$(rbm) build release --step update_responses_config --target alpha --target unsigned_releases_dir --target torbrowser
    205 
    +	$(rbm) build release --step link_old_mar_filenames --target alpha --target unsigned_releases_dir --target torbrowser
    206 
    +	NO_CODESIGNATURE=1 tools/update-responses/gen_incrementals alpha
    207 
    +	$(rbm) build release --step hash_incrementals --target alpha --target torbrowser
    208 
    +
    197 209 
     torbrowser-incrementals-nightly: submodule-update
    198 210 
     	$(rbm) build release --step update_responses_config --target nightly --target torbrowser
    199 211 
     	NO_CODESIGNATURE=1 tools/update-responses/gen_incrementals nightly
    ... ... @@ -507,6 +519,12 @@ mullvadbrowser-incrementals-release: submodule-update
    507 519 
     	tools/update-responses/gen_incrementals release
    508 520 
     	$(rbm) build release --step hash_incrementals --target release --target mullvadbrowser
    509 521
    522 
    +mullvadbrowser-incrementals-release-unsigned: submodule-update
    523 
    +	$(rbm) build release --step update_responses_config --target release --target unsigned_releases_dir --target mullvadbrowser
    524 
    +	$(rbm) build release --step link_old_mar_filenames --target release --target unsigned_releases_dir --target mullvadbrowser
    525 
    +	NO_CODESIGNATURE=1 tools/update-responses/gen_incrementals release
    526 
    +	$(rbm) build release --step hash_incrementals --target release --target mullvadbrowser
    527 
    +
    510 528 
     mullvadbrowser-incrementals-alpha: submodule-update
    511 529 
     	$(rbm) build release --step update_responses_config --target alpha --target create_unsigned_incrementals --target mullvadbrowser
    512 530 
     	tools/update-responses/download_missing_versions alpha
    ... ... @@ -514,6 +532,12 @@ mullvadbrowser-incrementals-alpha: submodule-update
    514 532 
     	tools/update-responses/gen_incrementals alpha
    515 533 
     	$(rbm) build release --step hash_incrementals --target alpha --target mullvadbrowser
    516 534
    535 
    +mullvadbrowser-incrementals-alpha-unsigned: submodule-update
    536 
    +	$(rbm) build release --step update_responses_config --target alpha --target unsigned_releases_dir --target mullvadbrowser
    537 
    +	$(rbm) build release --step link_old_mar_filenames --target alpha --target unsigned_releases_dir --target mullvadbrowser
    538 
    +	NO_CODESIGNATURE=1 tools/update-responses/gen_incrementals alpha
    539 
    +	$(rbm) build release --step hash_incrementals --target alpha --target torbrowser
    540 
    +
    517 541 
     mullvadbrowser-incrementals-nightly: submodule-update
    518 542 
     	$(rbm) build release --step update_responses_config --target nightly --target mullvadbrowser
    519 543 
     	NO_CODESIGNATURE=1 tools/update-responses/gen_incrementals nightly

  • projects/firefox/build
    ... ... @@ -91,7 +91,11 @@ MOZCONFIG_EOF
    91 91 
     [% END -%]
    92 92
    93 93 
     [% IF c("var/override_updater_url") -%]
    94 
    -  cp $rootdir/marsigner.der toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der
    94 
    +  [% IF c("var/release") || c("var/alpha") -%]
    95 
    +    cp $rootdir/marsigner.der toolkit/mozapps/update/updater/release_secondary.der
    96 
    +  [% ELSIF c("var/nightly") -%]
    97 
    +    cp $rootdir/marsigner.der toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der
    98 
    +  [% END -%]
    95 99 
     [% END -%]
    96 100
    97 101 
     export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system

  • projects/firefox/config
    ... ... @@ -35,9 +35,8 @@ var:
    35 35 
       updater_url: 'https://aus1.torproject.org/torbrowser/update_3/'
    36 36
    37 37 
       # Uncomment this if you want to test the updater. You will need to provide a
    38 
    -  # marsigner.der in this directory, too. It will be used as a replacement for
    39 
    -  # the nightly builds keys only. So, using this option for alphas and releases
    40 
    -  # will not work (the browser will fail with a key/signature mismatch).
    38 
    +  # marsigner.der in this directory, too. It will replace either the release
    39 
    +  # key, or the nightly key, depending on the channel you are building.
    41 40 
       # override_updater_url: 'https://tb-build-05.torproject.org/~you/update_3/'
    42 41
    43 42 
       rezip: |

  • projects/release/config
    ... ... @@ -133,6 +133,10 @@ targets:
    133 133 
         var:
    134 134 
           create_unsigned_incrementals: 1
    135 135
    136 
    +  unsigned_releases_dir:
    137 
    +    var:
    138 
    +      unsigned_releases_dir: 1
    139 
    +
    136 140 
     input_files:
    137 141
    138 142 
     # Release

  • projects/release/link_old_mar_filenames
    ... ... @@ -3,7 +3,7 @@
    3 3 
     # This script is for #40933:
    4 4 
     #   Fix generating incrementals between 12.5.x and 13.0
    5 5 
     [% FOREACH version = c("var/torbrowser_incremental_from") %]
    6 
    -  cd [% shell_quote(path(dest_dir)) %]/signed/[% version %]
    6 
    +  cd [% shell_quote(path(dest_dir)) %]/[% IF c("var/unsigned_releases_dir") %]un[% END %]signed/[% version %]
    7 7 
       test -e [% c("var/project-name") %]-linux-i686-[% version %]_ALL.mar || \
    8 8 
         ln -s [% c("var/project-name") %]-linux32-[% version %]_ALL.mar \
    9 9 
               [% c("var/project-name") %]-linux-i686-[% version %]_ALL.mar

  • projects/release/update_responses_config.yml
    ... ... @@ -3,7 +3,7 @@ tmp_dir: '[% c("tmp_dir") %]'
    3 3 
     create_downloads_json: 1
    4 4 
     appname_marfile: '[% c("var/project-name") %]'
    5 5 
     appname_bundle: '[% c("var/project-name") %]'
    6 
    -releases_dir: [% path(c('output_dir')) %][% IF ! c("var/nightly") %]/signed[% END %]
    6 
    +releases_dir: [% path(c('output_dir')) %][% IF ! c("var/nightly") %]/[% IF c("var/unsigned_releases_dir") -%]un[% END %]signed[% END %]
    7 7 
     download:
    8 8 
         gpg_keyring: ../../keyring/torbrowser.gpg
    9 9 
         archive_url: 'https://archive.torproject.org/tor-package-archive/[% c("var/projectname") %]'

    • —
    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