[tbb-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"

boklm (@boklm) git at gitlab.torproject.org
Fri Dec 1 08:48:43 UTC 2023 


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:

- Makefile
- projects/release/config
- − projects/release/link_old_mar_filenames


Changes:

=====================================
Makefile
=====================================
@@ -183,7 +183,6 @@ torbrowser-testbuild-src: submodule-update
 torbrowser-incrementals-release: submodule-update
 	$(rbm) build release --step update_responses_config --target release --target create_unsigned_incrementals --target torbrowser
 	tools/update-responses/download_missing_versions release
-	$(rbm) build release --step link_old_mar_filenames --target release --target torbrowser
 	tools/update-responses/gen_incrementals release
 	$(rbm) build release --step hash_incrementals --target release --target torbrowser
 
@@ -196,7 +195,6 @@ torbrowser-incrementals-release-unsigned: submodule-update
 torbrowser-incrementals-alpha: submodule-update
 	$(rbm) build release --step update_responses_config --target alpha --target create_unsigned_incrementals --target torbrowser
 	tools/update-responses/download_missing_versions alpha
-	$(rbm) build release --step link_old_mar_filenames --target alpha --target torbrowser
 	tools/update-responses/gen_incrementals alpha
 	$(rbm) build release --step hash_incrementals --target alpha --target torbrowser
 
@@ -223,14 +221,12 @@ torbrowser-dmg2mar-release: submodule-update
 	$(rbm) build release --step update_responses_config --target release --target signed --target torbrowser
 	$(rbm) build release --step dmg2mar --target release --target signed --target torbrowser
 	tools/update-responses/download_missing_versions release
-	$(rbm) build release --step link_old_mar_filenames --target release --target torbrowser
 	CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals release
 
 torbrowser-dmg2mar-alpha: submodule-update
 	$(rbm) build release --step update_responses_config --target alpha --target signed --target torbrowser
 	$(rbm) build release --step dmg2mar --target alpha --target signed --target torbrowser
 	tools/update-responses/download_missing_versions alpha
-	$(rbm) build release --step link_old_mar_filenames --target alpha --target torbrowser
 	CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals alpha
 
 torbrowser-compare-windows-signed-unsigned-release: submodule-update
@@ -527,7 +523,6 @@ mullvadbrowser-testbuild-src: submodule-update
 mullvadbrowser-incrementals-release: submodule-update
 	$(rbm) build release --step update_responses_config --target release --target create_unsigned_incrementals --target mullvadbrowser
 	tools/update-responses/download_missing_versions release
-	$(rbm) build release --step link_old_mar_filenames --target release --target mullvadbrowser
 	tools/update-responses/gen_incrementals release
 	$(rbm) build release --step hash_incrementals --target release --target mullvadbrowser
 
@@ -540,7 +535,6 @@ mullvadbrowser-incrementals-release-unsigned: submodule-update
 mullvadbrowser-incrementals-alpha: submodule-update
 	$(rbm) build release --step update_responses_config --target alpha --target create_unsigned_incrementals --target mullvadbrowser
 	tools/update-responses/download_missing_versions alpha
-	$(rbm) build release --step link_old_mar_filenames --target alpha --target mullvadbrowser
 	tools/update-responses/gen_incrementals alpha
 	$(rbm) build release --step hash_incrementals --target alpha --target mullvadbrowser
 
@@ -567,14 +561,12 @@ mullvadbrowser-dmg2mar-release: submodule-update
 	$(rbm) build release --step update_responses_config --target release --target signed --target mullvadbrowser
 	$(rbm) build release --step dmg2mar --target release --target signed --target mullvadbrowser
 	tools/update-responses/download_missing_versions release
-	$(rbm) build release --step link_old_mar_filenames --target release --target mullvadbrowser
 	CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals release
 
 mullvadbrowser-dmg2mar-alpha: submodule-update
 	$(rbm) build release --step update_responses_config --target alpha --target signed --target mullvadbrowser
 	$(rbm) build release --step dmg2mar --target alpha --target signed --target mullvadbrowser
 	tools/update-responses/download_missing_versions alpha
-	$(rbm) build release --step link_old_mar_filenames --target alpha --target mullvadbrowser
 	CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals alpha
 
 mullvadbrowser-compare-windows-signed-unsigned-release: submodule-update


=====================================
projects/release/config
=====================================
@@ -243,11 +243,6 @@ steps:
     debug: 0
     input_files: []
     update_responses_config: '[% INCLUDE update_responses_config %]'
-  link_old_mar_filenames:
-    build_log: '-'
-    debug: 0
-    input_files: []
-    link_old_mar_filenames: '[% INCLUDE link_old_mar_filenames %]'
   create_update_responses_tar:
     build_log: '-'
     debug: 0


=====================================
projects/release/link_old_mar_filenames deleted
=====================================
@@ -1,19 +0,0 @@
-#!/bin/bash
-[% c("var/set_default_env") -%]
-# This script is for #40933:
-#   Fix generating incrementals between 12.5.x and 13.0
-[% FOREACH version = c("var/torbrowser_incremental_from") %]
-  cd [% shell_quote(path(dest_dir)) %]/[% IF c("var/unsigned_releases_dir") %]un[% END %]signed/[% version %]
-  test -e [% c("var/project-name") %]-linux-i686-[% version %]_ALL.mar || \
-    ln -s [% c("var/project-name") %]-linux32-[% version %]_ALL.mar \
-          [% c("var/project-name") %]-linux-i686-[% version %]_ALL.mar
-  test -e [% c("var/project-name") %]-linux-x86_64-[% version %]_ALL.mar || \
-    ln -s [% c("var/project-name") %]-linux64-[% version %]_ALL.mar \
-          [% c("var/project-name") %]-linux-x86_64-[% version %]_ALL.mar
-  test -e [% c("var/project-name") %]-windows-i686-[% version %]_ALL.mar || \
-    ln -s [% c("var/project-name") %]-win32-[% version %]_ALL.mar \
-          [% c("var/project-name") %]-windows-i686-[% version %]_ALL.mar
-  test -e [% c("var/project-name") %]-windows-x86_64-[% version %]_ALL.mar || \
-    ln -s [% c("var/project-name") %]-win64-[% version %]_ALL.mar \
-          [% c("var/project-name") %]-windows-x86_64-[% version %]_ALL.mar
-[% END -%]



View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/e0f8b5890e8aa4e862915c7f310d92caeffb6cc4

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/e0f8b5890e8aa4e862915c7f310d92caeffb6cc4
You're receiving this email because of your account on gitlab.torproject.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tbb-commits/attachments/20231201/4755f049/attachment-0001.htm>

More information about the tbb-commits mailing list