Opened 5 years ago

Closed 4 years ago

#13015 closed defect (fixed)

Update gitian signing+sig check+upload scripts to use tag/branch

Reported by: mikeperry Owned by: erinn
Priority: Medium Milestone:
Component: Applications/Tor bundles/installation Version:
Severity: Keywords: GeorgKoppen201501, tbb-4.5-alpha-3
Cc: boklm, gk Actual Points:
Parent ID: Points:
Reviewer: Sponsor:

Description

We should standardize the directory location of candidate builds, to make it clearer what a build directory corresponds to.

basename git describe --all is probably what we want to use as the target dir for a build.

Child Tickets

Attachments (2)

0001-Bug-13015-use-git-tags-to-set-tor-browser-version.patch (13.9 KB) - added by boklm 5 years ago.
0001-Bug-13015-use-git-tags-to-set-tor-browser-version_v2.patch (13.9 KB) - added by boklm 5 years ago.
new version of the patch

Download all attachments as: .zip

Change History (14)

comment:1 Changed 5 years ago by mikeperry

Keywords: TorBrowserTeam201410 added; TorBrowserTeam201409 removed

comment:2 Changed 5 years ago by boklm

I attached a patch to do this. However, I did not run a build with those changes yet to check that everything is working. I will update this ticket when I've done it.

Here is a copy past from the commit message:

This commit adds a get-tb-version script which uses the git tags to
output the Tor Browser version and its build directory. The output
should be used with 'eval' in shell scripts to define the variables.
It takes as argument the type of version (release, alpha or beta).

If the current commit is tagged with tag tbb-4.2-build15, get-tb-version
will output this:

    TORBROWSER_VERSION=4.2
    TORBROWSER_BUILDDIR=4.2-build15
    TORBROWSER_SYMLINK_VERSION=1

If the current commit is not tagged, get-tb-version will use the version
from the last tagged commit in history. The build directory will include
the commit hash rather than a build number. The output will be something
like this:

    TORBROWSER_VERSION=4.0
    TORBROWSER_BUILDDIR=4.0-1a98e3efb368
    TORBROWSER_SYMLINK_VERSION=0

The TORBROWSER_BUILDDIR variable is used as the build directory.

The TORBROWSER_SYMLINK_VERSION variable indicate whether we should
create a symlink TORBROWSER_VERSION -> TORBROWSER_BUILDDIR.

The various files which source the versions files and use
TORBROWSER_VERSION have been updated to eval the output of
get-tb-version too, and use TORBROWSER_BUILDDIR as build directory.

comment:3 Changed 5 years ago by gk

Cc: gk added

Changed 5 years ago by boklm

new version of the patch

comment:4 Changed 5 years ago by boklm

I uploaded a new version of the patch with the following changes:

  • rebased on master
  • adressing a comment from GeKo about running get-tb-version twice in mkbundle-*.sh

My test build with this patch failed for an unrelated reason (no space left on device in the container), and I have now restarted a new one.

comment:5 Changed 5 years ago by mikeperry

Keywords: TorBrowserTeam201411 added; TorBrowserTeam201410 removed

comment:6 Changed 5 years ago by mikeperry

Keywords: TorBrowserTeam201412 added; TorBrowserTeam201411 removed

comment:7 Changed 4 years ago by mikeperry

Keywords: TorBrowserTeam201501 added; TorBrowserTeam201412 removed

comment:8 Changed 4 years ago by mikeperry

Keywords: TorBrowserTeam201501R added; TorBrowserTeam201501 removed
Status: newneeds_review

comment:9 Changed 4 years ago by mikeperry

Keywords: tbb-4.5-alpha-3 added

comment:11 Changed 4 years ago by gk

Keywords: GeorgKoppen201501R added; TorBrowserTeam201501R removed

comment:12 Changed 4 years ago by gk

Keywords: GeorgKoppen201501 added; GeorgKoppen201501R removed
Resolution: fixed
Status: needs_reviewclosed

Looks good. This is merged in commit 0ca8d445690515e053e3dfbdaaf3b683b1021431.

Note: See TracTickets for help on using tickets.