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

Commits:

3 changed files:

Changes:

  • Makefile
    ... ... @@ -183,12 +183,14 @@ torbrowser-testbuild-src: submodule-update
    183 183 
     torbrowser-incrementals-release: submodule-update
    184 184 
     	$(rbm) build release --step update_responses_config --target release --target create_unsigned_incrementals --target torbrowser
    185 185 
     	tools/update-responses/download_missing_versions release
    186 
    +	$(rbm) build release --step link_old_mar_filenames --target release --target torbrowser
    186 187 
     	tools/update-responses/gen_incrementals release
    187 188 
     	$(rbm) build release --step hash_incrementals --target release --target torbrowser
    188 189
    189 190 
     torbrowser-incrementals-alpha: submodule-update
    190 191 
     	$(rbm) build release --step update_responses_config --target alpha --target create_unsigned_incrementals --target torbrowser
    191 192 
     	tools/update-responses/download_missing_versions alpha
    193 
    +	$(rbm) build release --step link_old_mar_filenames --target alpha --target torbrowser
    192 194 
     	tools/update-responses/gen_incrementals alpha
    193 195 
     	$(rbm) build release --step hash_incrementals --target alpha --target torbrowser
    194 196
    ... ... @@ -209,12 +211,14 @@ torbrowser-dmg2mar-release: submodule-update
    209 211 
     	$(rbm) build release --step update_responses_config --target release --target signed --target torbrowser
    210 212 
     	$(rbm) build release --step dmg2mar --target release --target signed --target torbrowser
    211 213 
     	tools/update-responses/download_missing_versions release
    214 
    +	$(rbm) build release --step link_old_mar_filenames --target release --target torbrowser
    212 215 
     	CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals release
    213 216
    214 217 
     torbrowser-dmg2mar-alpha: submodule-update
    215 218 
     	$(rbm) build release --step update_responses_config --target alpha --target signed --target torbrowser
    216 219 
     	$(rbm) build release --step dmg2mar --target alpha --target signed --target torbrowser
    217 220 
     	tools/update-responses/download_missing_versions alpha
    221 
    +	$(rbm) build release --step link_old_mar_filenames --target alpha --target torbrowser
    218 222 
     	CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals alpha
    219 223
    220 224
    ... ... @@ -499,12 +503,14 @@ mullvadbrowser-testbuild-src: submodule-update
    499 503 
     mullvadbrowser-incrementals-release: submodule-update
    500 504 
     	$(rbm) build release --step update_responses_config --target release --target create_unsigned_incrementals --target mullvadbrowser
    501 505 
     	tools/update-responses/download_missing_versions release
    506 
    +	$(rbm) build release --step link_old_mar_filenames --target release --target mullvadbrowser
    502 507 
     	tools/update-responses/gen_incrementals release
    503 508 
     	$(rbm) build release --step hash_incrementals --target release --target mullvadbrowser
    504 509
    505 510 
     mullvadbrowser-incrementals-alpha: submodule-update
    506 511 
     	$(rbm) build release --step update_responses_config --target alpha --target create_unsigned_incrementals --target mullvadbrowser
    507 512 
     	tools/update-responses/download_missing_versions alpha
    513 
    +	$(rbm) build release --step link_old_mar_filenames --target alpha --target mullvadbrowser
    508 514 
     	tools/update-responses/gen_incrementals alpha
    509 515 
     	$(rbm) build release --step hash_incrementals --target alpha --target mullvadbrowser
    510 516
    ... ... @@ -525,12 +531,14 @@ mullvadbrowser-dmg2mar-release: submodule-update
    525 531 
     	$(rbm) build release --step update_responses_config --target release --target signed --target mullvadbrowser
    526 532 
     	$(rbm) build release --step dmg2mar --target release --target signed --target mullvadbrowser
    527 533 
     	tools/update-responses/download_missing_versions release
    534 
    +	$(rbm) build release --step link_old_mar_filenames --target release --target mullvadbrowser
    528 535 
     	CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals release
    529 536
    530 537 
     mullvadbrowser-dmg2mar-alpha: submodule-update
    531 538 
     	$(rbm) build release --step update_responses_config --target alpha --target signed --target mullvadbrowser
    532 539 
     	$(rbm) build release --step dmg2mar --target alpha --target signed --target mullvadbrowser
    533 540 
     	tools/update-responses/download_missing_versions alpha
    541 
    +	$(rbm) build release --step link_old_mar_filenames --target alpha --target mullvadbrowser
    534 542 
     	CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals alpha
    535 543
    536 544

  • projects/release/config
    ... ... @@ -239,6 +239,11 @@ steps:
    239 239 
         debug: 0
    240 240 
         input_files: []
    241 241 
         update_responses_config: '[% INCLUDE update_responses_config %]'
    242 
    +  link_old_mar_filenames:
    243 
    +    build_log: '-'
    244 
    +    debug: 0
    245 
    +    input_files: []
    246 
    +    link_old_mar_filenames: '[% INCLUDE link_old_mar_filenames %]'
    242 247 
       create_update_responses_tar:
    243 248 
         build_log: '-'
    244 249 
         debug: 0

  • projects/release/link_old_mar_filenames
    1 
    +#!/bin/bash
    2 
    +[% c("var/set_default_env") -%]
    3 
    +# This script is for #40933:
    4 
    +#   Fix generating incrementals between 12.5.x and 13.0
    5 
    +[% FOREACH version = c("var/torbrowser_incremental_from") %]
    6 
    +  cd [% shell_quote(path(dest_dir)) %]/signed/[% version %]
    7 
    +  test -e [% c("var/project-name") %]-linux-i686-[% version %]_ALL.mar || \
    8 
    +    ln -s [% c("var/project-name") %]-linux32-[% version %]_ALL.mar \
    9 
    +          [% c("var/project-name") %]-linux-i686-[% version %]_ALL.mar
    10 
    +  test -e [% c("var/project-name") %]-linux-x86_64-[% version %]_ALL.mar || \
    11 
    +    ln -s [% c("var/project-name") %]-linux64-[% version %]_ALL.mar \
    12 
    +          [% c("var/project-name") %]-linux-x86_64-[% version %]_ALL.mar
    13 
    +  test -e [% c("var/project-name") %]-windows-i686-[% version %]_ALL.mar || \
    14 
    +    ln -s [% c("var/project-name") %]-win32-[% version %]_ALL.mar \
    15 
    +          [% c("var/project-name") %]-windows-i686-[% version %]_ALL.mar
    16 
    +  test -e [% c("var/project-name") %]-windows-x86_64-[% version %]_ALL.mar || \
    17 
    +    ln -s [% c("var/project-name") %]-win64-[% version %]_ALL.mar \
    18 
    +          [% c("var/project-name") %]-windows-x86_64-[% version %]_ALL.mar
    19 
    +[% END -%]

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