Skip to content

Makefile: Allow lightweight tags in MXQ_VERSION_GIT #70

Merged
merged 1 commit into from
Jan 5, 2018

Conversation

donald
Copy link
Contributor

@donald donald commented Jan 5, 2018

If we build from a git repository, the build system adds the output of
git describe to the version information.

However, per default git describe searches for annotated tags
only. Since version 0.22.5, we draft releases from github enterprise,
which creates lightweight tags. For this reason, the version string
ammendment was always based on the 0.22.4 release:

buczek@theinternet:~/git/mxq (master)$ ./mxqd --version
mxqd - MXQ v0.25.4 (beta) [0.22.4-134-g3ae9361]
  by Marius Tolzmann <marius.tolzmann@molgen.mpg.de> 2013-2016
     and Donald Buczek <buczek@molgen.mpg.de> 2015-2016
  Max Planck Institute for Molecular Genetics - Berlin Dahlem

Add --tags to git describe so that the version string is based on
the newest tag.

mxqd - MXQ v0.25.4 (beta) [0.25.4-4-g3ae9361]
  by Marius Tolzmann <marius.tolzmann@molgen.mpg.de> 2013-2016
     and Donald Buczek <buczek@molgen.mpg.de> 2015-2016
  Max Planck Institute for Molecular Genetics - Berlin Dahlem

If we build from a git repository, the build system adds the output of
`git describe` to the version information.

However, per default `git describe` searches for annotated tags
only. Since version 0.22.5, we draft releases from github enterprise,
which creates lightweight tags. For this reason, the version string
ammendment was always based on the 0.22.4 release:

    buczek@theinternet:~/git/mxq (master)$ ./mxqd --version
    mxqd - MXQ v0.25.4 (beta) [0.22.4-134-g3ae9361]
      by Marius Tolzmann <marius.tolzmann@molgen.mpg.de> 2013-2016
         and Donald Buczek <buczek@molgen.mpg.de> 2015-2016
      Max Planck Institute for Molecular Genetics - Berlin Dahlem

Add `--tags` to `git describe` so that the version string is based on
the newest tag.

    mxqd - MXQ v0.25.4 (beta) [0.25.4-4-g3ae9361]
      by Marius Tolzmann <marius.tolzmann@molgen.mpg.de> 2013-2016
         and Donald Buczek <buczek@molgen.mpg.de> 2015-2016
      Max Planck Institute for Molecular Genetics - Berlin Dahlem
@pmenzel pmenzel merged commit 7196274 into master Jan 5, 2018
@donald donald deleted the use-leightweight-tags branch October 28, 2022 14:22
Sign in to join this conversation on GitHub.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants