Skip to content

Commit 480e115

Browse files
dries-cdries-c
committed
Merge branch 'stable' into php/8.3-ffi
2 parents f083f99 + eb919ee commit 480e115

File tree

4 files changed

+42
-24
lines changed

4 files changed

+42
-24
lines changed

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

+28-13
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,15 @@ jobs:
5353
restore-keys: musl-cross-make-
5454

5555
- name: Checkout musl-cross-make
56+
if: steps.compiler-cache.outputs.cache-hit != 'true'
5657
uses: actions/checkout@v4
5758
with:
5859
repository: pmmp/musl-cross-make
5960
path: musl-cross-make
6061
ref: ${{ env.MUSL_CROSS_MAKE_VERSION }}
6162

6263
- name: Build compiler
64+
if: steps.compiler-cache.outputs.cache-hit != 'true'
6365
working-directory: musl-cross-make
6466
run: |
6567
echo "TARGET = aarch64-linux-musl" > config.mak
@@ -80,15 +82,15 @@ jobs:
8082
- name: Create tarball
8183
run: |
8284
tar -czf ./PHP-${{ inputs.php-version-base }}-Android-arm64-PM${{ inputs.pm-version-major }}.tar.gz bin
83-
tar -czf ./PHP-${{ inputs.php-version-base }}-Android-arm64-PM${{ inputs.pm-version-major }}-debugging-symbols.tar.gz bin-debug
85+
tar -czf ./Z-PHP-${{ inputs.php-version-base }}-Android-arm64-PM${{ inputs.pm-version-major }}-debugging-symbols.tar.gz bin-debug
8486
8587
- name: Upload artifacts
8688
uses: actions/upload-artifact@v4
8789
if: always()
8890
with:
8991
name: PHP-${{ inputs.php-version-base }}-Android-PM${{ inputs.pm-version-major }}
9092
path: |
91-
./PHP-${{ inputs.php-version-base }}-Android-arm64-PM${{ inputs.pm-version-major }}*.tar.gz
93+
./*PHP-${{ inputs.php-version-base }}-Android-arm64-PM${{ inputs.pm-version-major }}*.tar.gz
9294
install.log
9395
compile.sh
9496
if-no-files-found: error
@@ -136,15 +138,15 @@ jobs:
136138
- name: Create tarball
137139
run: |
138140
tar -czf ./PHP-${{ inputs.php-version-base }}-Linux-x86_64-PM${{ inputs.pm-version-major }}.tar.gz bin
139-
tar -czf ./PHP-${{ inputs.php-version-base }}-Linux-x86_64-PM${{ inputs.pm-version-major }}-debugging-symbols.tar.gz bin-debug
141+
tar -czf ./Z-PHP-${{ inputs.php-version-base }}-Linux-x86_64-PM${{ inputs.pm-version-major }}-debugging-symbols.tar.gz bin-debug
140142
141143
- name: Upload artifacts
142144
uses: actions/upload-artifact@v4
143145
if: always()
144146
with:
145147
name: PHP-${{ inputs.php-version-base }}-Linux-PM${{ inputs.pm-version-major }}
146148
path: |
147-
./PHP-${{ inputs.php-version-base }}-Linux-x86_64-PM${{ inputs.pm-version-major }}*.tar.gz
149+
./*PHP-${{ inputs.php-version-base }}-Linux-x86_64-PM${{ inputs.pm-version-major }}*.tar.gz
148150
install.log
149151
compile.sh
150152
if-no-files-found: error
@@ -202,15 +204,15 @@ jobs:
202204
- name: Create tarball
203205
run: |
204206
tar -czf ./PHP-${{ inputs.php-version-base }}-MacOS-${{ matrix.artifact-name }}-PM${{ inputs.pm-version-major }}.tar.gz bin
205-
tar -czf ./PHP-${{ inputs.php-version-base }}-MacOS-${{ matrix.artifact-name }}-PM${{ inputs.pm-version-major }}-debugging-symbols.tar.gz bin-debug
207+
tar -czf ./Z-PHP-${{ inputs.php-version-base }}-MacOS-${{ matrix.artifact-name }}-PM${{ inputs.pm-version-major }}-debugging-symbols.tar.gz bin-debug
206208
207209
- name: Upload artifacts
208210
uses: actions/upload-artifact@v4
209211
if: always()
210212
with:
211213
name: PHP-${{ inputs.php-version-base }}-MacOS-${{ matrix.artifact-name }}-PM${{ inputs.pm-version-major }}
212214
path: |
213-
./PHP-${{ inputs.php-version-base }}-MacOS-${{ matrix.artifact-name}}-PM${{ inputs.pm-version-major }}*.tar.gz
215+
./*PHP-${{ inputs.php-version-base }}-MacOS-${{ matrix.artifact-name}}-PM${{ inputs.pm-version-major }}*.tar.gz
214216
install.log
215217
compile.sh
216218
if-no-files-found: error
@@ -254,7 +256,7 @@ jobs:
254256
run: |
255257
mkdir temp
256258
Compress-Archive -Path .\bin -DestinationPath "PHP-${{ inputs.php-version-base }}-Windows-x64-PM${{ inputs.pm-version-major }}.zip"
257-
move php-debug-pack-*.zip temp/PHP-${{ inputs.php-version-base }}-Windows-x64-PM${{ inputs.pm-version-major }}-debugging-symbols.zip
259+
move php-debug-pack-*.zip temp/Z-PHP-${{ inputs.php-version-base }}-Windows-x64-PM${{ inputs.pm-version-major }}-debugging-symbols.zip
258260
move temp\*.zip .
259261
260262
- name: Upload artifacts
@@ -263,7 +265,7 @@ jobs:
263265
with:
264266
name: PHP-${{ inputs.php-version-base }}-Windows-PM${{ inputs.pm-version-major }}
265267
path: |
266-
PHP-${{ inputs.php-version-base }}-Windows-x64-PM${{ inputs.pm-version-major }}*.zip
268+
*PHP-${{ inputs.php-version-base }}-Windows-x64-PM${{ inputs.pm-version-major }}*.zip
267269
compile.log
268270
windows-compile-vs.bat
269271
if-no-files-found: error
@@ -290,7 +292,18 @@ jobs:
290292
uses: actions/download-artifact@v4
291293
with:
292294
path: ${{ github.workspace }}
293-
pattern: "PHP-${{ inputs.php-version-base }}-*-PM${{ inputs.pm-version-major }}"
295+
pattern: "*PHP-${{ inputs.php-version-base }}-*-PM${{ inputs.pm-version-major }}"
296+
297+
- name: Download .gdbinit for this PHP version
298+
run: |
299+
curl -L https://raw.githubusercontent.com/php/php-src/refs/heads/PHP-${{ inputs.php-version-base }}/.gdbinit -o Z-PHP-${{ inputs.php-version-base }}.gdbinit
300+
301+
- name: Upload .gdbinit artifact
302+
uses: actions/upload-artifact@v4
303+
with:
304+
name: PHP-${{ inputs.php-version-base }}.gdbinit
305+
path: |
306+
${{ github.workspace }}/*.gdbinit
294307
295308
- name: Generate release notes
296309
run: |
@@ -322,8 +335,9 @@ jobs:
322335
if: ${{ inputs.special-release != 'none' }}
323336
with:
324337
artifacts: |
325-
${{ github.workspace }}/PHP-*-PM*/*.tar.gz
326-
${{ github.workspace }}/PHP-*-Windows-PM*/*.zip
338+
${{ github.workspace }}/*PHP-*-PM*/*.tar.gz
339+
${{ github.workspace }}/*PHP-*-Windows-PM*/*.zip
340+
${{ github.workspace }}/*.gdbinit
327341
name: PM ${{ inputs.pm-version-major }}.x (${{ steps.date.outputs.DATE }}) - Recommended
328342
tag: pm${{ inputs.pm-version-major }}-latest
329343
commit: ${{ github.sha }}
@@ -337,8 +351,9 @@ jobs:
337351
uses: ncipollo/[email protected]
338352
with:
339353
artifacts: |
340-
${{ github.workspace }}/PHP-*-PM*/*.tar.gz
341-
${{ github.workspace }}/PHP-*-Windows-PM*/*.zip
354+
${{ github.workspace }}/*PHP-*-PM*/*.tar.gz
355+
${{ github.workspace }}/*PHP-*-Windows-PM*/*.zip
356+
${{ github.workspace }}/*.gdbinit
342357
name: PM ${{ inputs.pm-version-major }}.x (${{ steps.date.outputs.DATE }}) - PHP ${{ inputs.php-version-base }}
343358
tag: pm${{ inputs.pm-version-major }}-php-${{ inputs.php-version-base }}-latest
344359
commit: ${{ github.sha }}

‎.github/workflows/main.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,10 @@ jobs:
5454
uses: ncipollo/[email protected]
5555
with:
5656
artifacts: |
57-
${{ github.workspace }}/PHP-*-Linux-PM*/*.tar.gz
58-
${{ github.workspace }}/PHP-*-MacOS-*-PM*/*.tar.gz
59-
${{ github.workspace }}/PHP-*-Windows-PM*/*.zip
57+
${{ github.workspace }}/*PHP-*-PM*/*.tar.gz
58+
${{ github.workspace }}/*PHP-*-Windows-PM*/*.zip
59+
${{ github.workspace }}/*PHP-*.gdbinit/*.gdbinit
60+
6061
name: PHP (Build ${{ github.run_number }}) - Archive
6162
tag: php-build-${{ github.run_number }}
6263
commit: ${{ github.sha }}

‎compile.sh

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env bash
2-
PHP_VERSIONS=("8.2.25" "8.3.13")
2+
PHP_VERSIONS=("8.2.27" "8.3.15")
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.
@@ -15,7 +15,7 @@ LIBJPEG_VERSION="9f"
1515
OPENSSL_VERSION="3.4.0"
1616
LIBZIP_VERSION="1.10.1"
1717
SQLITE3_VERSION="3450200" #3.45.2
18-
LIBDEFLATE_VERSION="2335c047e91cac6fd04cb0fd2769380395149f15" #1.22 - see above note about "v" prefixes
18+
LIBDEFLATE_VERSION="78051988f96dc8d8916310d8b24021f01bd9e102" #1.23 - see above note about "v" prefixes
1919
LIBRDKAFKA_VER="2.1.1"
2020
LIBZSTD_VER="1.5.6"
2121
LIBGRPC_VER="1.58.1"
@@ -35,7 +35,7 @@ EXT_LIBDEFLATE_VERSION="0.2.1"
3535
EXT_MORTON_VERSION="0.1.2"
3636
EXT_XXHASH_VERSION="0.2.0"
3737
EXT_ARRAYDEBUG_VERSION="0.2.0"
38-
EXT_ENCODING_VERSION="0.3.0"
38+
EXT_ENCODING_VERSION="0.4.0"
3939
EXT_RDKAFKA_VERSION="6.0.3"
4040
EXT_ZSTD_VERSION="0.14.0"
4141
EXT_GRPC_VERSION="1.57.3"
@@ -138,6 +138,7 @@ fi
138138
export CXX="g++"
139139
#export AR="gcc-ar"
140140
export RANLIB=ranlib
141+
export STRIP="strip"
141142
#fi
142143

143144
COMPILE_FOR_ANDROID=no
@@ -505,6 +506,7 @@ if [ "$TOOLCHAIN_PREFIX" != "" ]; then
505506
export RANLIB="$TOOLCHAIN_PREFIX-ranlib"
506507
export CPP="$TOOLCHAIN_PREFIX-cpp"
507508
export LD="$TOOLCHAIN_PREFIX-ld"
509+
export STRIP="$TOOLCHAIN_PREFIX-strip"
508510
fi
509511

510512
echo "#include <stdio.h>" > test.c
@@ -1795,7 +1797,7 @@ function separate_symbols {
17951797
output_dirname="$SYMBOLS_DIR/$(dirname $libname)"
17961798
mkdir -p "$output_dirname" >> "$DIR/install.log" 2>&1
17971799
cp "$libname" "$SYMBOLS_DIR/$libname.debug" >> "$DIR/install.log" 2>&1
1798-
strip -S "$libname" >> "$DIR/install.log" 2>&1 || rm "$SYMBOLS_DIR/$libname.debug" #if this fails, this probably isn't an executable binary
1800+
"$STRIP" -S "$libname" >> "$DIR/install.log" 2>&1 || rm "$SYMBOLS_DIR/$libname.debug" #if this fails, this probably isn't an executable binary
17991801
}
18001802

18011803
if [ "$SEPARATE_SYMBOLS" != "no" ]; then

‎windows-compile-vs.ps1

+4-4
Original file line numberDiff line numberDiff line change
@@ -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="2335c047e91cac6fd04cb0fd2769380395149f15" #1.22 - see above note about "v" prefixes
15+
$LIBDEFLATE_VER="78051988f96dc8d8916310d8b24021f01bd9e102" #1.23 - see above note about "v" prefixes
1616
$LIBRDKAFKA_VER="2.1.1"
1717
$LIBZSTD_VER="1.5.6"
1818
$LIBGRPC_VER="1.56.2"
@@ -31,7 +31,7 @@ $PHP_LIBDEFLATE_VER="0.2.1"
3131
$PHP_XXHASH_VER="0.2.0"
3232
$PHP_XDEBUG_VER="3.3.2"
3333
$PHP_ARRAYDEBUG_VER="0.2.0"
34-
$PHP_ENCODING_VER="0.3.0"
34+
$PHP_ENCODING_VER="0.4.0"
3535
$PHP_VANILLAGENERATOR_VER="2.1.7"
3636
$PHP_LIBKAFKA_VER="6.0.3"
3737
$PHP_ZSTD_VER="0.13.0"
@@ -778,9 +778,9 @@ append-file-utf8 "extension=php_recursionguard.dll" $php_ini
778778
append-file-utf8 "recursionguard.enabled=0 ;disabled due to minor performance impact, only enable this if you need it for debugging" $php_ini
779779
append-file-utf8 ";extension=php_arraydebug.dll" $php_ini
780780
append-file-utf8 "" $php_ini
781-
if ($PHP_JIT_ENABLE_ARG -eq "on") {
781+
if ($PHP_JIT_ENABLE_ARG -eq "yes") {
782782
append-file-utf8 "; ---- ! WARNING ! ----" $php_ini
783-
append-file-utf8 "; JIT can provide big performance improvements, but as of PHP %PHP_VER% it is still unstable. For this reason, it is disabled by default." $php_ini
783+
append-file-utf8 "; JIT can provide big performance improvements, but as of PHP $PHP_VER it is still unstable. For this reason, it is disabled by default." $php_ini
784784
append-file-utf8 "; Enable it at your own risk. See https://www.php.net/manual/en/opcache.configuration.php#ini.opcache.jit for possible options." $php_ini
785785
append-file-utf8 "opcache.jit=off" $php_ini
786786
append-file-utf8 "opcache.jit_buffer_size=128M" $php_ini

0 commit comments

Comments
 (0)