Skip to content

Commit

Permalink
Merge branch 'php/8.2' into php/8.3
Browse files Browse the repository at this point in the history
  • Loading branch information
dktapps committed Apr 2, 2024
2 parents 8476774 + dabf89d commit bfe744a
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:
echo ":information_source: **Linux/MacOS users**: Please see [this page](https://doc.pmmp.io/en/rtfd/faq/installation/opcache.so.html) to fix extension loading errors. Also, check out the [PocketMine-MP Linux/MacOS installer](https://doc.pmmp.io/en/rtfd/installation/get-dot-pmmp-dot-io.html)." >> changelog.md
- name: Update latest branch release
uses: ncipollo/release-action@v1.13.0
uses: ncipollo/release-action@v1.14.0
with:
artifacts: |
${{ github.workspace }}/Linux-PM*/*.tar.gz
Expand All @@ -86,7 +86,7 @@ jobs:
prerelease: ${{ endsWith(github.ref_name, '-preview') }}

- name: Publish unique release
uses: ncipollo/release-action@v1.13.0
uses: ncipollo/release-action@v1.14.0
with:
artifacts: |
${{ github.workspace }}/Linux-PM*/*.tar.gz
Expand Down
21 changes: 11 additions & 10 deletions compile.sh
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
#!/usr/bin/env bash
[ -z "$PHP_VERSION" ] && PHP_VERSION="8.3.0"

ZLIB_VERSION="1.3"
ZLIB_VERSION="1.3.1"
GMP_VERSION="6.3.0"
CURL_VERSION="curl-8_5_0"
CURL_VERSION="curl-8_7_1"
YAML_VERSION="0.2.5"
LEVELDB_VERSION="1c7564468b41610da4f498430e795ca4de0931ff"
LIBXML_VERSION="2.10.1" #2.10.2 requires automake 1.16.3, which isn't easily available on Ubuntu 20.04
LIBPNG_VERSION="1.6.40"
LIBJPEG_VERSION="9e"
OPENSSL_VERSION="3.1.4"
LIBPNG_VERSION="1.6.43"
LIBJPEG_VERSION="9f"
OPENSSL_VERSION="3.2.1"
LIBZIP_VERSION="1.10.1"
SQLITE3_VERSION="3440200" #3.44.2
LIBDEFLATE_VERSION="dd12ff2b36d603dbb7fa8838fe7e7176fcbd4f6f" #1.19
SQLITE3_VERSION="3450200" #3.45.2
LIBDEFLATE_VERSION="275aa5141db6eda3587214e0f1d3a134768f557d" #1.20

EXT_PMMPTHREAD_VERSION="6.0.12"
EXT_PMMPTHREAD_VERSION="6.1.0"
EXT_YAML_VERSION="2.2.3"
EXT_LEVELDB_VERSION="317fdcd8415e1566fc2835ce2bdb8e19b890f9f3"
EXT_CHUNKUTILS2_VERSION="0.3.5"
EXT_XDEBUG_VERSION="3.3.0"
EXT_XDEBUG_VERSION="3.3.1"
EXT_IGBINARY_VERSION="3.2.15"
EXT_CRYPTO_VERSION="0.3.2"
EXT_RECURSIONGUARD_VERSION="0.1.0"
EXT_LIBDEFLATE_VERSION="0.2.1"
EXT_MORTON_VERSION="0.1.2"
EXT_XXHASH_VERSION="0.2.0"
EXT_ARRAYDEBUG_VERSION="0.2.0"
EXT_ENCODING_VERSION="0.2.3"
EXT_ENCODING_VERSION="0.3.0"

function write_out {
echo "[$1] $2"
Expand Down Expand Up @@ -662,6 +662,7 @@ function build_curl {
--without-brotli \
--without-nghttp2 \
--without-zstd \
--disable-docs \
--with-zlib="$INSTALL_DIR" \
--with-ssl="$INSTALL_DIR" \
--enable-threaded-resolver \
Expand Down
6 changes: 3 additions & 3 deletions windows-compile-vs.bat
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ set PTHREAD_W32_VER=3.0.0
set LEVELDB_MCPE_VER=1c7564468b41610da4f498430e795ca4de0931ff
set LIBDEFLATE_VER=dd12ff2b36d603dbb7fa8838fe7e7176fcbd4f6f

set PHP_PMMPTHREAD_VER=6.0.12
set PHP_PMMPTHREAD_VER=6.1.0
set PHP_YAML_VER=2.2.3
set PHP_CHUNKUTILS2_VER=0.3.5
set PHP_IGBINARY_VER=3.2.15
Expand All @@ -33,9 +33,9 @@ set PHP_RECURSIONGUARD_VER=0.1.0
set PHP_MORTON_VER=0.1.2
set PHP_LIBDEFLATE_VER=0.2.1
set PHP_XXHASH_VER=0.2.0
set PHP_XDEBUG_VER=3.3.0
set PHP_XDEBUG_VER=3.3.1
set PHP_ARRAYDEBUG_VER=0.2.0
set PHP_ENCODING_VER=0.2.3
set PHP_ENCODING_VER=0.3.0

set script_path=%~dp0
set log_file=%script_path%compile.log
Expand Down

0 comments on commit bfe744a

Please sign in to comment.