Skip to content

Commit

Permalink
release-alpha: bump to alpha (new versioning scheme)
Browse files Browse the repository at this point in the history
  • Loading branch information
alex-tee committed Sep 18, 2020
1 parent edb80ec commit c647841
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 12 deletions.
22 changes: 22 additions & 0 deletions CHANGELOG.md
@@ -1,6 +1,28 @@
# Changelog
All notable changes to this project will be documented in this file.

## [1.0.0-alpha.0.1.1] - 2020-09-18
### Added
- Increase open file limit on app startup
- Show popup when JACK shuts down
- Add test for deleting plugins
- Add more meson subprojects

### Changed
- Show underlying backends instead of RtAudio/RtMidi
- Place bounced material where the first region starts if bouncing regions
- Revise Trademark Policy
- Update Chinese (Traditional) translations

### Fixed
- Fix broken export/bounce (WAV and FLAC)
- Fix FreeBSD build
- Fix skipping setting of Carla engine options
- Fix crash when deleting a newly created MIDI track on an empty project
- Fix remembering position of divider between timeline and clip editor
- Fix crash when deleting a MIDI FX slot on a MIDI track
- Fix LV2 plugins not applying file selection changes

## [0.8.982] - 2020-09-15
### Added
- Allow renaming regions
Expand Down
2 changes: 1 addition & 1 deletion doc/user/conf.py
Expand Up @@ -30,7 +30,7 @@
from subprocess import check_output

# The full version, including alpha/beta/rc tags
release = '0.8.982'
release = '1.0.0-alpha.0.1.1'
# The short X.Y version
version = release[:-4]

Expand Down
23 changes: 13 additions & 10 deletions git-packaging-hooks/common.sh.inc
Expand Up @@ -49,13 +49,21 @@ function init()
[ "$CURRENT_BRANCH" == "$PACKAGING_BRANCH" ] && readonly IS_PACKAGING_BRANCH=1 || \
readonly IS_PACKAGING_BRANCH=0

# detect empty commit message
readonly GIT_COMMIT_MSG_FILE=.git/COMMIT_EDITMSG
[ "$(grep --invert-match "^\s*#" $GIT_COMMIT_MSG_FILE)" ] && IS_EMPTY_COMMIT_MSG=0 || \
IS_EMPTY_COMMIT_MSG=1

# detect commit message
commit_msg=`cat "$GIT_COMMIT_MSG_FILE"`

# misc string constants
readonly PRE_ALPHA_REGEX='^v[0-9]+\.[0-9]+\.[0-9]+-DEV\.[0-9]+\.[0-9]+$'
readonly ALPHA_REGEX='^v[0-9]+\.[0-9]+\.[0-9]+-alpha\.[0-9]+\.[0-9]+$'
readonly BETA_REGEX='^v[0-9]+\.[0-9]+\.[0-9]+-beta\.[0-9]+\.[0-9]+$'
readonly RC_REGEX='^v[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+$'
readonly STABLE_REGEX='^v[0-9]+\.[0-9]+\.[0-9]+$'
case "$1" in
case "$commit_msg" in
"release-pre-alpha:"*)
readonly MINOR_VERSION_REGEX="$PRE_ALPHA_REGEX"
readonly IS_RC=0
Expand Down Expand Up @@ -107,16 +115,11 @@ function init()
[ "$*" == '.git/COMMIT_EDITMSG' ] && readonly IS_PRE_COMMIT_STAGE=1 || \
readonly IS_PRE_COMMIT_STAGE=0

# detect empty commit message
readonly GIT_COMMIT_MSG_FILE=.git/COMMIT_EDITMSG
[ "$(grep --invert-match "^\s*#" $GIT_COMMIT_MSG_FILE)" ] && IS_EMPTY_COMMIT_MSG=0 || \
IS_EMPTY_COMMIT_MSG=1

# get existing revision tags
local ifs=$IFS ; IFS=' ' ;
local branch_minor_tags=$(git tag --list --merged HEAD | grep $MINOR_VERSION_REGEX)
local branch_rev_tags=$( git tag --list --merged HEAD | grep $REVISION_REGEX )
local unmerged_rev_tags=$(git tag --list --no-merged master | grep $REVISION_REGEX )
local branch_minor_tags=$(git tag --list --merged HEAD | grep -E $MINOR_VERSION_REGEX)
local branch_rev_tags=$( git tag --list --merged HEAD | grep -E $REVISION_REGEX )
local unmerged_rev_tags=$(git tag --list --no-merged master | grep -E $REVISION_REGEX )
readonly MINOR_VERSION_TAG=$(echo $branch_minor_tags | sort --version-sort | tail --lines=1)
readonly LAST_REVISION_TAG=$(echo $branch_rev_tags | sort --version-sort | tail --lines=1)
readonly HIGHEST_REV_TAG=$( echo $unmerged_rev_tags | sort --version-sort | tail --lines=1)
Expand All @@ -137,7 +140,7 @@ function init()
if (($IS_RC)); then
readonly VERSION_STRING=$MINOR_VERSION_TAG
else
readonly VERSION_STRING=$MINOR_VERSION_TAG.$(printf '%03d' $N_REVISIONS_AHEAD)
readonly VERSION_STRING=$MINOR_VERSION_TAG.$(printf '%d' $N_REVISIONS_AHEAD)
fi
else readonly N_REVISIONS_AHEAD='n/a'
readonly SHOULD_INCREMENT_REVISION='n/a'
Expand Down
2 changes: 1 addition & 1 deletion meson.build
Expand Up @@ -17,7 +17,7 @@

project (
'zrythm', ['c', 'cpp'],
version: '0.8.982',
version: '1.0.0-alpha.0.1.1',
license: 'AGPL-3-or-later',
meson_version: '>= 0.55.0',
default_options: [
Expand Down

0 comments on commit c647841

Please sign in to comment.