Merge branch 'stable'

it looks like I goofed up the last merge and the changelog didn't get
merged into master.
This commit is contained in:
Dylan K. Taylor 2021-10-02 20:18:06 +01:00
commit f9e6fd44bc
No known key found for this signature in database
GPG Key ID: 8927471A91CAFD3D
4 changed files with 21 additions and 7 deletions

View File

@ -13,7 +13,7 @@ jobs:
strategy:
matrix:
image: [ubuntu-20.04]
php: [8.0.9]
php: [8.0.11]
steps:
- uses: actions/checkout@v2 #needed for build.sh
@ -37,7 +37,7 @@ jobs:
fail-fast: false
matrix:
image: [ubuntu-20.04]
php: [8.0.9]
php: [8.0.11]
steps:
- uses: actions/checkout@v2
@ -87,7 +87,7 @@ jobs:
fail-fast: false
matrix:
image: [ubuntu-20.04]
php: [8.0.9]
php: [8.0.11]
steps:
- uses: actions/checkout@v2
@ -139,7 +139,7 @@ jobs:
fail-fast: false
matrix:
image: [ubuntu-20.04]
php: [8.0.9]
php: [8.0.11]
steps:
- uses: actions/checkout@v2
@ -191,7 +191,7 @@ jobs:
fail-fast: false
matrix:
image: [ubuntu-20.04]
php: [8.0.9]
php: [8.0.11]
steps:
- uses: actions/checkout@v2

@ -1 +1 @@
Subproject commit ad9cd1fdb47742038365ec8ec7e2ed61ba58a068
Subproject commit 7069f05845fa4a945df941158e4ce3d8aae65451

14
changelogs/3.23.md Normal file
View File

@ -0,0 +1,14 @@
**For Minecraft: Bedrock Edition 1.17.30**
### 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.23.0
- Added support for Minecraft: Bedrock Edition 1.17.30.
- Removed compatibility with earlier versions.
# 3.23.1
- Fixed broken build of 3.23.0.

View File

@ -42,7 +42,7 @@ function build_leveldb {
build_leveldb 84348b9b826cc280cde659185695d2170b54824c
rm -rf php-build
git clone https://github.com/php-build/php-build.git
git clone https://github.com/pmmp/php-build.git
cd php-build
./install-dependencies.sh
echo '"pthreads",,"https://github.com/pmmp/pthreads.git",,,"extension",' >> share/php-build/extension/definition