Opened on 10/01/2018 at 01:43:51 PM

Closed on 10/08/2018 at 02:30:02 PM

#7004 closed defect (fixed)

build numbers differ between Mercurial / Git

Reported by: tlucas Assignee: tlucas
Priority: P3 Milestone:
Module: Automation Keywords:
Cc: sebastian, kzar Blocked By:
Blocking: #6682 Platform: Unknown / Cross platform
Ready: yes Confidential: no
Tester: Unknown Verified working: no
Review URL(s):

https://codereview.adblockplus.org/29903558/
https://codereview.adblockplus.org/29904555/

Description (last modified by tlucas)

How to reproduce

  1. Clone adblockpluschrome from both www.github.com and hg.adblockplus.org (with git / hg accordingly)
  2. make sure to checkout / update both repositories to the current master
  3. Initiate a build of the current master $python build.py build -t gecko
  4. Look at the filename of the generated files

Observed behaviour

The build numbers (4th part of the version) differ (the build generated inside the git repository is lower)

Expected behaviour

The build numbers should match OR the build numbers generated from git should be higher (to avoid rejection of lower versions, once we start building / distributing from a git environment).

Hint

The responsible code is here
Git is not capable (to our current knowledge) of reliably reproducing the revision number yielded by Mercurial.

Attachments (0)

Change History (10)

comment:1 Changed on 10/01/2018 at 02:15:05 PM by tlucas

  • Description modified (diff)

comment:2 Changed on 10/06/2018 at 09:29:46 AM by tlucas

  • Description modified (diff)
  • Owner set to tlucas
  • Priority changed from Unknown to P3
  • Ready set

From IRC:

1:09 PM <snoack> I tried around a bit myself, and the best I could come up with is `git rev-list --count --branches --tags <rev>`. The number is still somewhat higher than with Mercurial, but well, if we never go back to Mercurial, that shouldn't cause any issues.

comment:3 Changed on 10/06/2018 at 09:30:08 AM by tlucas

  • Review URL(s) modified (diff)
  • Status changed from new to reviewing

comment:4 Changed on 10/06/2018 at 09:33:57 AM by tlucas

  • Blocking 6682 added

comment:5 Changed on 10/06/2018 at 10:59:00 AM by abpbot

A commit referencing this issue has landed:
Issue 7004 - Switch to a more robust buildnum generation

comment:6 Changed on 10/06/2018 at 10:59:37 AM by tlucas

  • Resolution set to fixed
  • Status changed from reviewing to closed

comment:7 Changed on 10/08/2018 at 01:20:12 PM by tlucas

  • Resolution fixed deleted
  • Status changed from closed to reopened

comment:8 Changed on 10/08/2018 at 02:29:32 PM by tlucas

  • Review URL(s) modified (diff)

comment:9 Changed on 10/08/2018 at 02:29:44 PM by abpbot

A commit referencing this issue has landed:
Issue 7004 - Actually return git's result

comment:10 Changed on 10/08/2018 at 02:30:02 PM by tlucas

  • Resolution set to fixed
  • Status changed from reopened to closed

Add Comment

Modify Ticket

Change Properties
Action
as closed .
The resolution will be deleted. Next status will be 'reopened'.
to The owner will be changed from tlucas.
 
Note: See TracTickets for help on using tickets.