From b85f3bd149d340268e68886691db874c5da40871 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Tue, 8 Jun 2021 20:20:30 +0100 Subject: [PATCH 1/4] make-release: abort on no changelog changes --- build/make-release.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/build/make-release.php b/build/make-release.php index d499ff3f6..1f50c542e 100644 --- a/build/make-release.php +++ b/build/make-release.php @@ -69,12 +69,16 @@ function main(array $argv) : void{ $currentVer->getPatch() + 1 )); - $versionInfoPath = dirname(__DIR__) . '/src/pocketmine/VersionInfo.php'; - replaceVersion($versionInfoPath, $currentVer->getBaseVersion(), false); - echo "please add appropriate notes to the changelog and press enter..."; fgets(STDIN); system('git add "' . dirname(__DIR__) . '/changelogs"'); + system('git diff --cached --quiet "' . dirname(__DIR__) . '/changelogs"', $result); + if($result === 0){ + echo "error: no changelog changes detected; aborting\n"; + exit(1); + } + $versionInfoPath = dirname(__DIR__) . '/src/pocketmine/VersionInfo.php'; + replaceVersion($versionInfoPath, $currentVer->getBaseVersion(), false); system('git commit -m "Release ' . $currentVer->getBaseVersion() . '" --include "' . $versionInfoPath . '"'); system('git tag ' . $currentVer->getBaseVersion()); replaceVersion($versionInfoPath, $nextVer->getBaseVersion(), true); From 99964709c932089189f921f62c6474a67fb94c9c Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Tue, 8 Jun 2021 20:21:55 +0100 Subject: [PATCH 2/4] Release 3.20.0 --- changelogs/3.20.md | 11 +++++++++++ src/pocketmine/VersionInfo.php | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 changelogs/3.20.md diff --git a/changelogs/3.20.md b/changelogs/3.20.md new file mode 100644 index 000000000..dd487969d --- /dev/null +++ b/changelogs/3.20.md @@ -0,0 +1,11 @@ +**For Minecraft: Bedrock Edition 1.17.0** + +### Note about API versions +Plugins which don't touch the protocol and compatible with any previous 3.x.y version will also run on these releases and do not need API bumps. +Plugin developers should **only** update their required API to this version if you need the changes in this build. + +**WARNING: If your plugin uses the protocol, you're not shielded by API change constraints.** You should consider using the `mcpe-protocol` directive in `plugin.yml` as a constraint if you do. + +# 3.20.0 +- Added support for Minecraft: Bedrock Edition 1.17.0 +- Removed compatibility with earlier versions. diff --git a/src/pocketmine/VersionInfo.php b/src/pocketmine/VersionInfo.php index 06abc71c7..a5bfade8f 100644 --- a/src/pocketmine/VersionInfo.php +++ b/src/pocketmine/VersionInfo.php @@ -33,6 +33,6 @@ if(defined('pocketmine\_VERSION_INFO_INCLUDED')){ const _VERSION_INFO_INCLUDED = true; const NAME = "PocketMine-MP"; -const BASE_VERSION = "3.19.4"; -const IS_DEVELOPMENT_BUILD = true; +const BASE_VERSION = "3.20.0"; +const IS_DEVELOPMENT_BUILD = false; const BUILD_NUMBER = 0; From 5503fadf1389eff82f6cfd5d328ae8441c43eebf Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Tue, 8 Jun 2021 20:21:55 +0100 Subject: [PATCH 3/4] 3.20.1 is next --- src/pocketmine/VersionInfo.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pocketmine/VersionInfo.php b/src/pocketmine/VersionInfo.php index a5bfade8f..5fa5f9805 100644 --- a/src/pocketmine/VersionInfo.php +++ b/src/pocketmine/VersionInfo.php @@ -33,6 +33,6 @@ if(defined('pocketmine\_VERSION_INFO_INCLUDED')){ const _VERSION_INFO_INCLUDED = true; const NAME = "PocketMine-MP"; -const BASE_VERSION = "3.20.0"; -const IS_DEVELOPMENT_BUILD = false; +const BASE_VERSION = "3.20.1"; +const IS_DEVELOPMENT_BUILD = true; const BUILD_NUMBER = 0; From 65c53e6512b69eeb5adc9650a46a2fa004aa19b5 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Wed, 9 Jun 2021 13:44:00 +0100 Subject: [PATCH 4/4] actions: use PHP 7.4.20 --- .github/workflows/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0df70f05d..20a5e3fd0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,7 +13,7 @@ jobs: strategy: matrix: image: [ubuntu-20.04] - php: [7.3.28, 7.4.19] + php: [7.3.28, 7.4.20] steps: - uses: actions/checkout@v2 #needed for build.sh @@ -37,7 +37,7 @@ jobs: fail-fast: false matrix: image: [ubuntu-20.04] - php: [7.3.28, 7.4.19] + php: [7.3.28, 7.4.20] steps: - uses: actions/checkout@v2 @@ -87,7 +87,7 @@ jobs: fail-fast: false matrix: image: [ubuntu-20.04] - php: [7.3.28, 7.4.19] + php: [7.3.28, 7.4.20] steps: - uses: actions/checkout@v2 @@ -137,7 +137,7 @@ jobs: fail-fast: false matrix: image: [ubuntu-20.04] - php: [7.3.28, 7.4.19] + php: [7.3.28, 7.4.20] steps: - uses: actions/checkout@v2 @@ -189,7 +189,7 @@ jobs: fail-fast: false matrix: image: [ubuntu-20.04] - php: [7.3.28, 7.4.19] + php: [7.3.28, 7.4.20] steps: - uses: actions/checkout@v2