Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement version major.minor.release-stage.build #3011

Merged
merged 3 commits into from
Sep 10, 2016
Merged

Conversation

jasp00
Copy link
Member

@jasp00 jasp00 commented Aug 31, 2016

This fixes #2969. Release versions are like 1.2.0-rc2. Development versions increment the build version, e.g. 1.2.0-rc2.479. When adding an upgrade method, the exact version should be specified to be nice with users of development versions, and to upgrade projects included in LMMS.

@@ -1,6 +1,6 @@
FIND_PACKAGE(Git)
IF(GIT_FOUND AND NOT FORCE_VERSION)
# Look for git tag information (e.g. Stable: "v1.0.0", Non-stable: "v1.0.0-123-a1b2c3d4")
# Look for git tag information (e.g. Tagged: "v1.0.0", Non-tagged: "v1.0.0-123-a1b2c3d4")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If your commit removes the -a1b2c3d4, that should be fixed in this comment.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

v1.0.0-123-a1b2c3d4 is the output of git describe, but it should be v1.0.0-123-a1b2c3d.

@jasp00 jasp00 force-pushed the version branch 2 times, most recently from b36858c to c9e11bd Compare September 1, 2016 22:44
@jasp00 jasp00 changed the title Implement version major.minor.build-stage.revision Implement version major.minor.release-stage.build Sep 5, 2016
@jasp00 jasp00 merged commit 5eb0ae2 into LMMS:master Sep 10, 2016
@jasp00 jasp00 deleted the version branch September 10, 2016 02:28
sambler added a commit to sambler/lmms that referenced this pull request Sep 19, 2016
* master: (213 commits)
  Update Pattern and AutomationPattern length (LMMS#3037)
  Refresh i18n strings
  Hint text update
  Drop notes with length zero (LMMS#3031)
  Background tweak
  Background
  Update Flanger
  Exclude .ts files from the Github linguist
  Redesign Multitap echo (LMMS#3008)
  Update i18n source strings
  Extended arpeggiator functions (LMMS#2130)
  Fix sample track playback in BB tracks (LMMS#3023)
  Sort plug-in embedded resources (LMMS#3014)
  Implement version major.minor.release-stage.build (LMMS#3011)
  Fix regressions on loading broken projects (LMMS#3013)
  Improved file input validation. (LMMS#2523)
  Fix sample track view in BB editor (LMMS#3002)
  Request change in model when dropping a track (LMMS#3000)
  Add LocklessAllocator and use it in LocklessList (LMMS#2998)
  Drop forceStep in AutomatableModel (LMMS#3010)
  ...
sdasda7777 pushed a commit to sdasda7777/lmms that referenced this pull request Jun 28, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants