Opened 7 months ago

Closed 6 months ago

#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.

Change History (10)

comment:1 Changed 7 months ago by tlucas

  • Description modified (diff)

comment:2 Changed 7 months ago 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 7 months ago by tlucas

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

comment:4 Changed 7 months ago by tlucas

  • Blocking 6682 added

comment:5 Changed 7 months ago by abpbot

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

comment:6 Changed 7 months ago by tlucas

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

comment:7 Changed 6 months ago by tlucas

  • Resolution fixed deleted
  • Status changed from closed to reopened

comment:8 Changed 6 months ago by tlucas

  • Review URL(s) modified (diff)

comment:9 Changed 6 months ago by abpbot

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

comment:10 Changed 6 months ago by tlucas

  • Resolution set to fixed
  • Status changed from reopened to closed
Note: See TracTickets for help on using tickets.