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.

Sign up for GitHub

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

Jump to bottom

2.3.4 Release #11278

Merged
merged 3 commits into from
Feb 26, 2023
Merged

2.3.4 Release #11278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e508caf
Adjust the GIT_COMMIT_COUNT to match the git describe count. This fix…
daschuer Feb 14, 2023
24d2275
Add the missing debian entry of the previous release
daschuer Feb 14, 2023
66b4339
Bump Mixxx Version to 2.3.4
daschuer Feb 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ if(NOT CMAKE_CONFIGURATION_TYPES)
endif()
endif()

project(mixxx VERSION 2.3.3)
project(mixxx VERSION 2.3.4)
# Work around missing version suffixes support https://gitlab.kitware.com/cmake/cmake/-/issues/16716
set(MIXXX_VERSION_PRERELEASE "") # set to "alpha-pre" "beta" or ""

Expand Down
18 changes: 6 additions & 12 deletions cmake/modules/GitInfo.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,13 @@ if(NOT GIT_DESCRIBE)
else()
message(NOTICE "Git branch: ${GIT_BRANCH}")
endif()

# Get the number of commits on the working branch
execute_process(
COMMAND git rev-list --count --first-parent HEAD
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
OUTPUT_VARIABLE GIT_COMMIT_COUNT
OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_QUIET
)
if(NOT GIT_COMMIT_COUNT)
message(NOTICE "Git commit count: unknown")
else()
# Get the number of commits since the version tag
string(REGEX MATCH ".*-([0-9]*)-.*" GIT_COMMIT_COUNT_MATCH "${GIT_DESCRIBE}")
if (GIT_COMMIT_COUNT_MATCH)
set(GIT_COMMIT_COUNT "${CMAKE_MATCH_1}")
message(NOTICE "Git commit count: ${GIT_COMMIT_COUNT}")
else()
message(NOTICE "Git commit count: unknown")
endif()
endif()
else()
Expand Down
6 changes: 6 additions & 0 deletions packaging/debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
mixxx (2.3.3-1~bionic) bionic; urgency=medium

* Build of 2.3.3

-- RJ Skerry-Ryan <rryan@mixxx.org> Tue, 21 Jun 2022 21:24:47 +0000

mixxx (2.3.2-1~bionic) bionic; urgency=medium

* Build of 2.3.2
Expand Down