Skip to content

Bug 41365: Indent download*.json files

boklm requested to merge boklm/tor-browser-build:bug_41365 into main

Merge Info

Issues

Resolves

  • #41365
  • tor-browser#xxxxx
  • mullvad-browser#xxxxx

Related

  • tor-browser-build#xxxxx
  • tor-browser#xxxxx
  • mullvad-browser#xxxxx

Merging

Target Branches

  • main: esr128-14.5
  • maint-14.0: esr128-14.0
  • maint-13.5: esr115-13.5

Backporting

Timeline

  • No Backport (preferred): patchset for the next major stable
  • Immediate: patchset needed as soon as possible
  • Next Minor Stable Release: patchset that needs to be verified in nightly before backport
  • Eventually: patchset that needs to be verified in alpha before backport

(Optional) Justification

  • Emergency security update: patchset fixes CVEs, 0-days, etc
  • Censorship event: patchset enables censorship circumvention
  • Critical bug-fix: patchset fixes a bug in core-functionality
  • Consistency: patchset which would make development easier if it were in both the alpha and release branches; developer tools, build system changes, etc
  • Sponsor required: patchset required for sponsor
  • Other: please explain

Issue Tracking

Uplifting

  • Patchset is a candidate for uplift to upstream projects (e.g. mingw, clang, etc)

Review

Request Reviewer

  • Request review from an applications developer depending on modified system:
    • NOTE: if the MR modifies multiple areas, please /cc all the relevant reviewers (since gitlab only allows 1 reviewer)
    • accessibility : henry
    • android : clairehurst, dan
    • build system : boklm
    • extensions : ma1
    • firefox internals (XUL/JS/XPCOM) : jwilde, ma1
    • fonts : pierov
    • frontend (implementation) : henry
    • frontend (review) : donuts, morgan
    • localization : henry, pierov
    • macOS : clairehurst, dan
    • nightly builds : boklm
    • rebases/release-prep : boklm, dan, ma1, morgan, pierov
    • security : jwilde, ma1
    • signing : boklm, morgan
    • updater : pierov
    • windows : jwilde, morgan
    • misc/other : morgan, pierov

Change Description

Indent the download*.json files, to make editing them easier, and the diff in git logs easier to read.

Marking as draft since it's based on !1149 (merged).

How Tested

After generating update-responses for 14.5a3, download-linux-x86_64.json looks like this:

{
   "binary" : "https://dist.torproject.org/torbrowser/14.5a3/tor-browser-linux-x86_64-14.5a3.tar.xz",
   "git_tag" : "tbb-14.5a3-build1",
   "sig" : "https://dist.torproject.org/torbrowser/14.5a3/tor-browser-linux-x86_64-14.5a3.tar.xz.asc",
   "version" : "14.5a3"
}

And downloads.json:

{
   "downloads" : {
      "linux-i686" : {
         "ALL" : {
            "binary" : "https://dist.torproject.org/torbrowser/14.5a3/tor-browser-linux-i686-14.5a3.tar.xz",
            "sig" : "https://dist.torproject.org/torbrowser/14.5a3/tor-browser-linux-i686-14.5a3.tar.xz.asc"
         }
      },
      "linux-x86_64" : {
         "ALL" : {
            "binary" : "https://dist.torproject.org/torbrowser/14.5a3/tor-browser-linux-x86_64-14.5a3.tar.xz",
            "sig" : "https://dist.torproject.org/torbrowser/14.5a3/tor-browser-linux-x86_64-14.5a3.tar.xz.asc"
         }
      },
      "macos" : {
         "ALL" : {
            "binary" : "https://dist.torproject.org/torbrowser/14.5a3/tor-browser-macos-14.5a3.dmg",
            "sig" : "https://dist.torproject.org/torbrowser/14.5a3/tor-browser-macos-14.5a3.dmg.asc"
         }
      },
      "win32" : {
         "ALL" : {
            "binary" : "https://dist.torproject.org/torbrowser/14.5a3/tor-browser-windows-i686-portable-14.5a3.exe",
            "sig" : "https://dist.torproject.org/torbrowser/14.5a3/tor-browser-windows-i686-portable-14.5a3.exe.asc"
         }
      },
      "win64" : {
         "ALL" : {
            "binary" : "https://dist.torproject.org/torbrowser/14.5a3/tor-browser-windows-x86_64-portable-14.5a3.exe",
            "sig" : "https://dist.torproject.org/torbrowser/14.5a3/tor-browser-windows-x86_64-portable-14.5a3.exe.asc"
         }
      }
   },
   "tag" : "tbb-14.5a3-build1",
   "version" : "14.5a3"
}

Merge request reports

Loading