From e796fffc7c5db4baefab57a25642f79dce618450 Mon Sep 17 00:00:00 2001 From: Linus Probert Date: Tue, 25 Sep 2018 14:23:47 +0200 Subject: [PATCH 1/6] Prepare release script for real versions --- CMakeLists.txt | 2 +- build/scripts/release_patch_version.sh | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5d1b658..30d089a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ project(breakhack C) set(breakhack_GAME_TITLE "BreakHack") set(breakhack_MAJOR_VERSION 1) set(breakhack_MINOR_VERSION 1) -set(breakhack_PATCH_VERSION 4) +set(breakhack_PATCH_VERSION 3) set(breakhack_RELEASE_TYPE "") include(FindLua) diff --git a/build/scripts/release_patch_version.sh b/build/scripts/release_patch_version.sh index c79f9e0..82ded79 100644 --- a/build/scripts/release_patch_version.sh +++ b/build/scripts/release_patch_version.sh @@ -1,11 +1,13 @@ #!/bin/sh # Get the current patch version -LAST_VERSION=$(egrep -o 'breakhack_PATCH_VERSION [0-9]+' CMakeLists.txt | awk '{print $2}') -NEXT_VERSION=$((LAST_VERSION + 1)) +MAJOR_VERSION=$(egrep -o 'breakhack_MAJOR_VERSION [0-9]+' CMakeLists.txt | awk '{print $2}') +MINOR_VERSION=$(egrep -o 'breakhack_MINOR_VERSION [0-9]+' CMakeLists.txt | awk '{print $2}') +LAST_PATCH_VERSION=$(egrep -o 'breakhack_PATCH_VERSION [0-9]+' CMakeLists.txt | awk '{print $2}') +NEXT_PATCH_VERSION=$((LAST_VERSION + 1)) -LAST_TAG=early-access-v$LAST_VERSION -NEXT_TAG=early-access-v$NEXT_VERSION +LAST_TAG=v$MAJOR_VERSION.$MINOR_VERSION.$LAST_PATCH_VERSION +NEXT_TAG=v$MAJOR_VERSION.$MINOR_VERSION.$NEXT_PATCH_VERSION # Update the version and create release notes sed -i -e "s/breakhack_PATCH_VERSION [0-9]\+/breakhack_PATCH_VERSION $NEXT_VERSION/" CMakeLists.txt From 6811c426673b3ef27d741396f59f1ed660f3dbfd Mon Sep 17 00:00:00 2001 From: Linus Probert Date: Tue, 25 Sep 2018 14:24:11 +0200 Subject: [PATCH 2/6] Patch version raised to --- CMakeLists.txt | 2 +- build/releasenotes/v1.1.1.txt | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 build/releasenotes/v1.1.1.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 30d089a..7b4501a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ project(breakhack C) set(breakhack_GAME_TITLE "BreakHack") set(breakhack_MAJOR_VERSION 1) set(breakhack_MINOR_VERSION 1) -set(breakhack_PATCH_VERSION 3) +set(breakhack_PATCH_VERSION ) set(breakhack_RELEASE_TYPE "") include(FindLua) diff --git a/build/releasenotes/v1.1.1.txt b/build/releasenotes/v1.1.1.txt new file mode 100644 index 0000000..45bda60 --- /dev/null +++ b/build/releasenotes/v1.1.1.txt @@ -0,0 +1,4 @@ +e796fff Prepare release script for real versions +ae44d5c Adds minimal Steam fiddling protection +6e3343a License stuff and README updates +899d2e5 Update to build env From bc452a3fb61cdd27c24e761741b9cafa07b3c5fb Mon Sep 17 00:00:00 2001 From: Linus Probert Date: Tue, 25 Sep 2018 14:26:50 +0200 Subject: [PATCH 3/6] Patch version raised to --- build/releasenotes/{v1.1.1.txt => v1.1.4.txt} | 1 + build/scripts/release_patch_version.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) rename build/releasenotes/{v1.1.1.txt => v1.1.4.txt} (83%) diff --git a/build/releasenotes/v1.1.1.txt b/build/releasenotes/v1.1.4.txt similarity index 83% rename from build/releasenotes/v1.1.1.txt rename to build/releasenotes/v1.1.4.txt index 45bda60..1b0ad40 100644 --- a/build/releasenotes/v1.1.1.txt +++ b/build/releasenotes/v1.1.4.txt @@ -1,3 +1,4 @@ +6811c42 Patch version raised to e796fff Prepare release script for real versions ae44d5c Adds minimal Steam fiddling protection 6e3343a License stuff and README updates diff --git a/build/scripts/release_patch_version.sh b/build/scripts/release_patch_version.sh index 82ded79..5fb5d6f 100644 --- a/build/scripts/release_patch_version.sh +++ b/build/scripts/release_patch_version.sh @@ -4,7 +4,7 @@ MAJOR_VERSION=$(egrep -o 'breakhack_MAJOR_VERSION [0-9]+' CMakeLists.txt | awk '{print $2}') MINOR_VERSION=$(egrep -o 'breakhack_MINOR_VERSION [0-9]+' CMakeLists.txt | awk '{print $2}') LAST_PATCH_VERSION=$(egrep -o 'breakhack_PATCH_VERSION [0-9]+' CMakeLists.txt | awk '{print $2}') -NEXT_PATCH_VERSION=$((LAST_VERSION + 1)) +NEXT_PATCH_VERSION=$((LAST_PATCH_VERSION + 1)) LAST_TAG=v$MAJOR_VERSION.$MINOR_VERSION.$LAST_PATCH_VERSION NEXT_TAG=v$MAJOR_VERSION.$MINOR_VERSION.$NEXT_PATCH_VERSION From 90603b4ebeb3ad5e38342162fb614ac335c91152 Mon Sep 17 00:00:00 2001 From: Linus Probert Date: Tue, 25 Sep 2018 14:28:03 +0200 Subject: [PATCH 4/6] Fix what my bad build script broke --- CMakeLists.txt | 2 +- build/scripts/release_patch_version.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7b4501a..5d1b658 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ project(breakhack C) set(breakhack_GAME_TITLE "BreakHack") set(breakhack_MAJOR_VERSION 1) set(breakhack_MINOR_VERSION 1) -set(breakhack_PATCH_VERSION ) +set(breakhack_PATCH_VERSION 4) set(breakhack_RELEASE_TYPE "") include(FindLua) diff --git a/build/scripts/release_patch_version.sh b/build/scripts/release_patch_version.sh index 5fb5d6f..6b75af6 100644 --- a/build/scripts/release_patch_version.sh +++ b/build/scripts/release_patch_version.sh @@ -10,7 +10,7 @@ LAST_TAG=v$MAJOR_VERSION.$MINOR_VERSION.$LAST_PATCH_VERSION NEXT_TAG=v$MAJOR_VERSION.$MINOR_VERSION.$NEXT_PATCH_VERSION # Update the version and create release notes -sed -i -e "s/breakhack_PATCH_VERSION [0-9]\+/breakhack_PATCH_VERSION $NEXT_VERSION/" CMakeLists.txt +sed -i -e "s/breakhack_PATCH_VERSION [0-9]\+/breakhack_PATCH_VERSION $NEXT_PATCH_VERSION/" CMakeLists.txt git log --oneline $LAST_TAG..HEAD > build/releasenotes/$NEXT_TAG.txt git add build/releasenotes/$NEXT_TAG.txt git commit -a -m"Patch version raised to $NEXT_VERSION" From aefbd9586ba1893580c790b6cbf378b3cf9460e7 Mon Sep 17 00:00:00 2001 From: Linus Probert Date: Tue, 2 Oct 2018 23:27:24 +0200 Subject: [PATCH 5/6] Update readme to match new github url --- README.md | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 86bf4fe..a11b7fa 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,13 @@ -[![Build Status](https://travis-ci.org/LiquidityC/breakhack.svg?branch=master)](https://travis-ci.org/LiquidityC/breakhack) -[![Build Status](https://ci.appveyor.com/api/projects/status/2nvna97cmm4cf535?svg=true)](https://ci.appveyor.com/project/LiquidityC/breakhack) -[![Codacy Badge](https://api.codacy.com/project/badge/Grade/fc02d56fa7194e61b2c7d260fd2e4186)](https://www.codacy.com/app/LiquidityC/breakhack?utm_source=github.com&utm_medium=referral&utm_content=LiquidityC/breakhack&utm_campaign=Badge_Grade) -[![CodeFactor](https://www.codefactor.io/repository/github/liquidityc/breakhack/badge/master)](https://www.codefactor.io/repository/github/liquidityc/breakhack/overview/master) - -[![GitHub issues](https://img.shields.io/github/issues/liquidityc/breakhack.svg)](https://github.com/liquidityc/breakhack/issues) -[![GitHub closed issues](https://img.shields.io/github/issues-closed/liquidityc/breakhack.svg)](https://github.com/liquidityc/breakhack/issues) -![GitHub (pre-)release](https://img.shields.io/github/release/liquidityc/breakhack/all.svg) -[![Github All Releases](https://img.shields.io/github/downloads/liquidityc/breakhack/total.svg)](https://github.com/liquidityc/breakhack/releases) -[![HitCount](http://hits.dwyl.io/liquidityc/breakhack.svg)](http://hits.dwyl.io/liquidityc/breakhack) +[![Build Status](https://travis-ci.org/Oliveshark/breakhack.svg?branch=master)](https://travis-ci.org/Oliveshark/breakhack) +[![Build Status](https://ci.appveyor.com/api/projects/status/2nvna97cmm4cf535?svg=true)](https://ci.appveyor.com/project/Oliveshark/breakhack) +[![Codacy Badge](https://api.codacy.com/project/badge/Grade/fc02d56fa7194e61b2c7d260fd2e4186)](https://www.codacy.com/app/Oliveshark/breakhack?utm_source=github.com&utm_medium=referral&utm_content=Oliveshark/breakhack&utm_campaign=Badge_Grade) +[![CodeFactor](https://www.codefactor.io/repository/github/oliveshark/breakhack/badge/master)](https://www.codefactor.io/repository/github/oliveshark/breakhack/overview/master) + +[![GitHub issues](https://img.shields.io/github/issues/oliveshark/breakhack.svg)](https://github.com/oliveshark/breakhack/issues) +[![GitHub closed issues](https://img.shields.io/github/issues-closed/oliveshark/breakhack.svg)](https://github.com/oliveshark/breakhack/issues) +![GitHub (pre-)release](https://img.shields.io/github/release/oliveshark/breakhack/all.svg) +[![Github All Releases](https://img.shields.io/github/downloads/oliveshark/breakhack/total.svg)](https://github.com/oliveshark/breakhack/releases) +[![HitCount](http://hits.dwyl.io/oliveshark/breakhack.svg)](http://hits.dwyl.io/oliveshark/breakhack) Something in the ways of a roguelike ================================ @@ -41,7 +41,7 @@ License ------- BreakHack is released under two different licenses. -- The source code is released under [GPLv3](https://github.com/LiquidityC/breakhack/blob/master/LICENSE.txt) +- The source code is released under [GPLv3](https://github.com/oliveshark/breakhack/blob/master/LICENSE.txt) - The Steam release is released under the [Steam subscriber agreement](https://store.steampowered.com/subscriber_agreement/) Compile @@ -66,4 +66,5 @@ your name to the credits list (once I add it in game). Links ----- -- [https://liquidityc.itch.io/breakhack](https://liquidityc.itch.io/breakhack) +- [Itch.io](https://store.steampowered.com/app/931040/BreakHack/) +- [Steam](https://liquidityc.itch.io/breakhack) From 5d1490b14e5ff90675c29c67a7590ac280dcd11e Mon Sep 17 00:00:00 2001 From: Linus Probert Date: Tue, 2 Oct 2018 23:34:02 +0200 Subject: [PATCH 6/6] Another README badge fix --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a11b7fa..8d6d92b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![Build Status](https://travis-ci.org/Oliveshark/breakhack.svg?branch=master)](https://travis-ci.org/Oliveshark/breakhack) -[![Build Status](https://ci.appveyor.com/api/projects/status/2nvna97cmm4cf535?svg=true)](https://ci.appveyor.com/project/Oliveshark/breakhack) -[![Codacy Badge](https://api.codacy.com/project/badge/Grade/fc02d56fa7194e61b2c7d260fd2e4186)](https://www.codacy.com/app/Oliveshark/breakhack?utm_source=github.com&utm_medium=referral&utm_content=Oliveshark/breakhack&utm_campaign=Badge_Grade) +[![Build status](https://ci.appveyor.com/api/projects/status/2a18npdntkmlx3dc?svg=true)](https://ci.appveyor.com/project/LiquidityC/breakhack) +[![Codacy Badge](https://api.codacy.com/project/badge/Grade/fc02d56fa7194e61b2c7d260fd2e4186)](https://www.codacy.com/app/LiquidityC/breakhack?utm_source=github.com&utm_medium=referral&utm_content=Oliveshark/breakhack&utm_campaign=Badge_Grade) [![CodeFactor](https://www.codefactor.io/repository/github/oliveshark/breakhack/badge/master)](https://www.codefactor.io/repository/github/oliveshark/breakhack/overview/master) [![GitHub issues](https://img.shields.io/github/issues/oliveshark/breakhack.svg)](https://github.com/oliveshark/breakhack/issues)