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

[tor-commits] [Git][tpo/applications/tor-browser-build][maint-13.0] Revert "Bug 40933: Add symlinks to have incrementals between 12.5.x and 13.0"

Title: GitLab

boklm pushed to branch maint-13.0 at The Tor Project / Applications / tor-browser-build

Commits:

  • e0f8b589
    by Richard Pospesel at 2023-11-30T14:41:29+00:00 
    Revert "Bug 40933: Add symlinks to have incrementals between 12.5.x and 13.0"

This reverts commit a21969281d18941b69a94b994b0797f8b88ad45f.

Bug 40936: We are no longer building incrementals from the 12.5 series so its time for this patch to go

3 changed files:

Changes:

  • Makefile
    ... ... @@ -183,7 +183,6 @@ 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
    187 186 
     	tools/update-responses/gen_incrementals release
    188 187 
     	$(rbm) build release --step hash_incrementals --target release --target torbrowser
    189 188
    ... ... @@ -196,7 +195,6 @@ torbrowser-incrementals-release-unsigned: submodule-update
    196 195 
     torbrowser-incrementals-alpha: submodule-update
    197 196 
     	$(rbm) build release --step update_responses_config --target alpha --target create_unsigned_incrementals --target torbrowser
    198 197 
     	tools/update-responses/download_missing_versions alpha
    199 
    -	$(rbm) build release --step link_old_mar_filenames --target alpha --target torbrowser
    200 198 
     	tools/update-responses/gen_incrementals alpha
    201 199 
     	$(rbm) build release --step hash_incrementals --target alpha --target torbrowser
    202 200
    ... ... @@ -223,14 +221,12 @@ torbrowser-dmg2mar-release: submodule-update
    223 221 
     	$(rbm) build release --step update_responses_config --target release --target signed --target torbrowser
    224 222 
     	$(rbm) build release --step dmg2mar --target release --target signed --target torbrowser
    225 223 
     	tools/update-responses/download_missing_versions release
    226 
    -	$(rbm) build release --step link_old_mar_filenames --target release --target torbrowser
    227 224 
     	CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals release
    228 225
    229 226 
     torbrowser-dmg2mar-alpha: submodule-update
    230 227 
     	$(rbm) build release --step update_responses_config --target alpha --target signed --target torbrowser
    231 228 
     	$(rbm) build release --step dmg2mar --target alpha --target signed --target torbrowser
    232 229 
     	tools/update-responses/download_missing_versions alpha
    233 
    -	$(rbm) build release --step link_old_mar_filenames --target alpha --target torbrowser
    234 230 
     	CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals alpha
    235 231
    236 232 
     torbrowser-compare-windows-signed-unsigned-release: submodule-update
    ... ... @@ -527,7 +523,6 @@ mullvadbrowser-testbuild-src: submodule-update
    527 523 
     mullvadbrowser-incrementals-release: submodule-update
    528 524 
     	$(rbm) build release --step update_responses_config --target release --target create_unsigned_incrementals --target mullvadbrowser
    529 525 
     	tools/update-responses/download_missing_versions release
    530 
    -	$(rbm) build release --step link_old_mar_filenames --target release --target mullvadbrowser
    531 526 
     	tools/update-responses/gen_incrementals release
    532 527 
     	$(rbm) build release --step hash_incrementals --target release --target mullvadbrowser
    533 528
    ... ... @@ -540,7 +535,6 @@ mullvadbrowser-incrementals-release-unsigned: submodule-update
    540 535 
     mullvadbrowser-incrementals-alpha: submodule-update
    541 536 
     	$(rbm) build release --step update_responses_config --target alpha --target create_unsigned_incrementals --target mullvadbrowser
    542 537 
     	tools/update-responses/download_missing_versions alpha
    543 
    -	$(rbm) build release --step link_old_mar_filenames --target alpha --target mullvadbrowser
    544 538 
     	tools/update-responses/gen_incrementals alpha
    545 539 
     	$(rbm) build release --step hash_incrementals --target alpha --target mullvadbrowser
    546 540
    ... ... @@ -567,14 +561,12 @@ mullvadbrowser-dmg2mar-release: submodule-update
    567 561 
     	$(rbm) build release --step update_responses_config --target release --target signed --target mullvadbrowser
    568 562 
     	$(rbm) build release --step dmg2mar --target release --target signed --target mullvadbrowser
    569 563 
     	tools/update-responses/download_missing_versions release
    570 
    -	$(rbm) build release --step link_old_mar_filenames --target release --target mullvadbrowser
    571 564 
     	CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals release
    572 565
    573 566 
     mullvadbrowser-dmg2mar-alpha: submodule-update
    574 567 
     	$(rbm) build release --step update_responses_config --target alpha --target signed --target mullvadbrowser
    575 568 
     	$(rbm) build release --step dmg2mar --target alpha --target signed --target mullvadbrowser
    576 569 
     	tools/update-responses/download_missing_versions alpha
    577 
    -	$(rbm) build release --step link_old_mar_filenames --target alpha --target mullvadbrowser
    578 570 
     	CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals alpha
    579 571
    580 572 
     mullvadbrowser-compare-windows-signed-unsigned-release: submodule-update

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

  • projects/release/link_old_mar_filenames deleted
    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)) %]/[% IF c("var/unsigned_releases_dir") %]un[% END %]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 

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