Commit a2196928 authored by boklm's avatar boklm Committed by richard
Browse files

Bug 40933: Add symlinks to have incrementals between 12.5.x and 13.0 

After #40829, the filenames of mar files for Windows and Linux changed,
which prevents generating incrementals. To make it possible to generate
the incrementals we add symlinks from the old filenames to the new.

We should revert this in 13.0.1.
parent eb5f3bd2

Makefile

+8 −0
Original line number Diff line number Diff line
@@ -183,12 +183,14 @@ 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



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
@@ -209,12 +211,14 @@ 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
@@ -499,12 +503,14 @@ 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



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
@@ -525,12 +531,14 @@ 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

projects/release/config

+5 −0
Original line number Diff line number Diff line
@@ -239,6 +239,11 @@ 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

0 → 100644
+19 −0
Original line number Diff line number Diff line 
#!/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)) %]/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 -%]