From 7f09fbda8ddc5748b8407cb9779495bad46ad1c3 Mon Sep 17 00:00:00 2001 From: Linus Probert Date: Thu, 17 May 2018 09:49:03 +0200 Subject: [PATCH] Fiddled some more with release script --- CMakeLists.txt | 8 ++++---- build/releasenotes/.empty | 0 build/scripts/release_patch_version.sh | 16 ++++++++++------ 3 files changed, 14 insertions(+), 10 deletions(-) create mode 100644 build/releasenotes/.empty diff --git a/CMakeLists.txt b/CMakeLists.txt index 905b874..320a7f8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ project(breakhack C) set(breakhack_GAME_TITLE "BreakHack") set(breakhack_MAJOR_VERSION 0) set(breakhack_MINOR_VERSION 1) -set(breakhack_PATCH_VERSION 5) +set(breakhack_PATCH_VERSION 4) set(breakhack_RELEASE_TYPE "(early access)") include(FindLua) @@ -293,9 +293,9 @@ set(CPACK_PACKAGE_VENDOR "OliveShark") set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.md") set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt") set(CPACK_PACKAGE_DIRECTORY ${PROJECT_BINARY_DIR}/package) -set(CPACK_PACKAGE_VERSION_MAJOR "0") -set(CPACK_PACKAGE_VERSION_MINOR "1") -set(CPACK_PACKAGE_VERSION_PATCH "1") +set(CPACK_PACKAGE_VERSION_MAJOR ${breakhack_MAJOR_VERSION}) +set(CPACK_PACKAGE_VERSION_MINOR ${breakhack_MINOR_VERSION}) +set(CPACK_PACKAGE_VERSION_PATCH ${breakhack_PATCH_VERSION}) set(CPACK_PACKAGE_INSTALL_DIRECTORY "BreakHack") set(CPACK_PACKAGE_FILE_NAME "breakhack-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") set(CPACK_PACKAGE_CHECKSUM "MD5") diff --git a/build/releasenotes/.empty b/build/releasenotes/.empty new file mode 100644 index 0000000..e69de29 diff --git a/build/scripts/release_patch_version.sh b/build/scripts/release_patch_version.sh index d53399c..856948a 100644 --- a/build/scripts/release_patch_version.sh +++ b/build/scripts/release_patch_version.sh @@ -1,12 +1,16 @@ #!/bin/sh # Get the current patch version -CURRENT_VERSION=$(egrep -o 'breakhack_PATCH_VERSION [0-9]+' CMakeLists.txt | awk '{print $2}') -git tag early-access-v$CURRENT_VERSION -git push origin early-access-v$CURRENT_VERSION +LAST_VERSION=$(egrep -o 'breakhack_PATCH_VERSION [0-9]+' CMakeLists.txt | awk '{print $2}') +NEXT_VERSION=$((LAST_VERSION + 1)) -NEXT_VERSION=$((CURRENT_VERSION + 1)) -# Update the version +# Update the version and create release notes sed -i -e "s/breakhack_PATCH_VERSION [0-9]\+/breakhack_PATCH_VERSION $NEXT_VERSION/" CMakeLists.txt +git log --oneline early-access-v$LAST_VERSION..early-access-v$NEXT_VERSION >> build/releasenotes/early-access-$NEXT_VERSION git commit -a -m"Patch version raised to $NEXT_VERSION" -"push" + +# Create the tag +git tag early-access-v$NEXT_VERSION + +# Push to repo +git push --follow-tags