Skip to content

Commit ea60f21

Browse files
committed
Update versions, Linux bins are now built on Ubuntu 22.04
1 parent 638aa66 commit ea60f21

File tree

3 files changed

+23
-17
lines changed

3 files changed

+23
-17
lines changed

.github/workflows/main-pm-matrix.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ env:
2626
jobs:
2727
android:
2828
name: Android arm64
29-
runs-on: ubuntu-20.04
29+
runs-on: ubuntu-22.04
3030

3131
steps:
3232
- uses: actions/checkout@v4
@@ -110,7 +110,7 @@ jobs:
110110

111111
linux:
112112
name: Linux
113-
runs-on: ubuntu-20.04
113+
runs-on: ubuntu-22.04
114114

115115
steps:
116116
- uses: actions/checkout@v4

compile.sh

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,33 @@
11
#!/usr/bin/env bash
2-
PHP_VERSIONS=("8.2.27" "8.3.15")
2+
PHP_VERSIONS=("8.2.28" "8.3.21")
33

44
#### NOTE: Tags with "v" prefixes behave weirdly in the GitHub API. They'll be stripped in some places but not others.
55
#### Use commit hashes to avoid this.
66

77

88
ZLIB_VERSION="1.3.1"
99
GMP_VERSION="6.3.0"
10-
CURL_VERSION="curl-8_9_1"
10+
11+
### Think twice before updating the minor/major versions of curl.
12+
### curl is by far the worst offender when it comes to random
13+
### build breakages on updates.
14+
CURL_VERSION="curl-8_13_0"
15+
1116
YAML_VERSION="0.2.5"
1217
LEVELDB_VERSION="1c7564468b41610da4f498430e795ca4de0931ff" #release not tagged
13-
LIBXML_VERSION="2.10.1" #2.10.2 requires automake 1.16.3, which isn't easily available on Ubuntu 20.04
14-
LIBPNG_VERSION="1.6.43"
18+
LIBXML_VERSION="2.14.3"
19+
LIBPNG_VERSION="1.6.48"
1520
LIBJPEG_VERSION="9f"
16-
OPENSSL_VERSION="3.4.0"
17-
LIBZIP_VERSION="1.10.1"
18-
SQLITE3_VERSION="3450200" #3.45.2
19-
LIBDEFLATE_VERSION="78051988f96dc8d8916310d8b24021f01bd9e102" #1.23 - see above note about "v" prefixes
21+
OPENSSL_VERSION="3.5.0"
22+
LIBZIP_VERSION="1.11.3"
23+
SQLITE3_VERSION="3500000" #3.50.0
24+
LIBDEFLATE_VERSION="96836d7d9d10e3e0d53e6edb54eb908514e336c4" #1.24 - see above note about "v" prefixes
2025

2126
EXT_PMMPTHREAD_VERSION="6.1.1"
2227
EXT_YAML_VERSION="2.2.4"
2328
EXT_LEVELDB_VERSION="317fdcd8415e1566fc2835ce2bdb8e19b890f9f3" #release not tagged
2429
EXT_CHUNKUTILS2_VERSION="0.3.5"
25-
EXT_XDEBUG_VERSION="3.3.2"
30+
EXT_XDEBUG_VERSION="3.4.3"
2631
EXT_IGBINARY_VERSION="3.2.16"
2732
EXT_CRYPTO_VERSION="abbe7cbf869f96e69f2ce897271a61d32f43c7c0" #release not tagged
2833
EXT_RECURSIONGUARD_VERSION="0.1.0"
@@ -717,6 +722,7 @@ function build_curl {
717722
--without-brotli \
718723
--without-nghttp2 \
719724
--without-zstd \
725+
--without-libpsl \
720726
--with-zlib="$INSTALL_DIR" \
721727
--with-ssl="$INSTALL_DIR" \
722728
--enable-threaded-resolver \
@@ -954,6 +960,7 @@ function build_libzip {
954960
-DENABLE_GNUTLS=OFF \
955961
-DENABLE_MBEDTLS=OFF \
956962
-DENABLE_LZMA=OFF \
963+
-DBUILD_OSSFUZZ=OFF \
957964
-DENABLE_ZSTD=OFF >> "$DIR/install.log" 2>&1
958965
write_compile
959966
make -j $THREADS >> "$DIR/install.log" 2>&1 && mark_cache
@@ -969,9 +976,9 @@ function build_libzip {
969976

970977
function build_sqlite3 {
971978
if [ "$DO_STATIC" == "yes" ]; then
972-
local EXTRA_FLAGS="--enable-static=yes --enable-shared=no"
979+
local EXTRA_FLAGS="--disable-shared"
973980
else
974-
local EXTRA_FLAGS="--enable-static=no --enable-shared=yes"
981+
local EXTRA_FLAGS="--disable-static"
975982
fi
976983

977984
write_library sqlite3 "$SQLITE3_VERSION"
@@ -987,7 +994,6 @@ function build_sqlite3 {
987994
LDFLAGS="$LDFLAGS -L${INSTALL_DIR}/lib" CPPFLAGS="$CPPFLAGS -I${INSTALL_DIR}/include" RANLIB=$RANLIB ./configure \
988995
--prefix="$INSTALL_DIR" \
989996
--disable-dependency-tracking \
990-
--enable-static-shell=no \
991997
$EXTRA_FLAGS \
992998
$CONFIGURE_FLAGS >> "$DIR/install.log" 2>&1
993999
write_compile

windows-compile-vs.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
$ErrorActionPreference="Stop"
22
$ProgressPreference="SilentlyContinue"
33

4-
$PHP_VERSIONS=@("8.2.25", "8.3.13")
4+
$PHP_VERSIONS=@("8.2.28", "8.3.21")
55

66
$PHP_SDK_VER="2.3.0"
77
$ARCH="x64"
@@ -12,7 +12,7 @@ $ARCH="x64"
1212
$LIBYAML_VER="0.2.5"
1313
$PTHREAD_W32_VER="3.0.0"
1414
$LEVELDB_MCPE_VER="1c7564468b41610da4f498430e795ca4de0931ff" #release not tagged
15-
$LIBDEFLATE_VER="78051988f96dc8d8916310d8b24021f01bd9e102" #1.23 - see above note about "v" prefixes
15+
$LIBDEFLATE_VER="96836d7d9d10e3e0d53e6edb54eb908514e336c4" #1.24 - see above note about "v" prefixes
1616

1717
$PHP_PMMPTHREAD_VER="6.1.1"
1818
$PHP_YAML_VER="2.2.4"
@@ -24,7 +24,7 @@ $PHP_RECURSIONGUARD_VER="0.1.0"
2424
$PHP_MORTON_VER="0.1.2"
2525
$PHP_LIBDEFLATE_VER="0.2.1"
2626
$PHP_XXHASH_VER="0.2.0"
27-
$PHP_XDEBUG_VER="3.3.2"
27+
$PHP_XDEBUG_VER="3.4.3"
2828
$PHP_ARRAYDEBUG_VER="0.2.0"
2929
$PHP_ENCODING_VER="0.4.0"
3030

0 commit comments

Comments
 (0)