Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
9acf0a4
[skip ci] Backport GA root workflow changes
iluuu1994 Nov 20, 2024
f8c37dc
Merge branch 'PHP-8.1' into PHP-8.2
iluuu1994 Nov 20, 2024
378307c
Merge branch 'PHP-8.2' into PHP-8.3
iluuu1994 Nov 20, 2024
72ab374
Merge branch 'PHP-8.3' into PHP-8.4
iluuu1994 Nov 20, 2024
0b8fe1a
Merge branch 'PHP-8.4'
iluuu1994 Nov 20, 2024
c70b97d
Make MySQLnd protocol stmt test work on 32bit
bukka Nov 18, 2024
dedb0f8
Merge branch 'PHP-8.1' into PHP-8.2
cmb69 Nov 20, 2024
9a0c351
Merge branch 'PHP-8.2' into PHP-8.3
cmb69 Nov 20, 2024
2187d20
Merge branch 'PHP-8.3' into PHP-8.4
cmb69 Nov 20, 2024
7b91131
Merge branch 'PHP-8.4'
cmb69 Nov 20, 2024
e23ac83
[skip ci] Don't test mysqli with libmysqlclient 8.4
iluuu1994 Nov 20, 2024
aa40d3a
Merge branch 'PHP-8.1' into PHP-8.2
iluuu1994 Nov 20, 2024
3f1e1ee
Merge branch 'PHP-8.2' into PHP-8.3
iluuu1994 Nov 20, 2024
5d4ae65
Merge branch 'PHP-8.3' into PHP-8.4
iluuu1994 Nov 20, 2024
73f1e1b
Merge branch 'PHP-8.4'
iluuu1994 Nov 20, 2024
aca88ba
Move FreeBSD build to GitHub actions with QEMU
iluuu1994 Nov 15, 2024
12f20ce
Merge branch 'PHP-8.1' into PHP-8.2
iluuu1994 Nov 20, 2024
02ef371
[skip ci] Add --no-progress to FreeBSD build
iluuu1994 Nov 20, 2024
dbd6c94
Merge branch 'PHP-8.2' into PHP-8.3
iluuu1994 Nov 20, 2024
2b50534
Merge branch 'PHP-8.3' into PHP-8.4
iluuu1994 Nov 20, 2024
b3ab930
Enable -Werror for FreeBSD build
iluuu1994 Nov 20, 2024
3aa4973
Merge branch 'PHP-8.4'
iluuu1994 Nov 20, 2024
3656a84
Skip file_put_contents_variation7.phpt on Windows
cmb69 Nov 7, 2024
38ec780
Merge branch 'PHP-8.2' into PHP-8.3
cmb69 Nov 20, 2024
19e685e
Merge branch 'PHP-8.3' into PHP-8.4
cmb69 Nov 20, 2024
ce55152
Merge branch 'PHP-8.4'
cmb69 Nov 20, 2024
ff3b4ec
Fix GH-16851: JIT_G(enabled) not set correctly on other threads
dktapps Nov 19, 2024
58ed759
Merge branch 'PHP-8.2' into PHP-8.3
cmb69 Nov 20, 2024
ae62779
Merge branch 'PHP-8.3' into PHP-8.4
cmb69 Nov 20, 2024
81779c2
Merge branch 'PHP-8.4'
cmb69 Nov 20, 2024
83ca374
Revert "Merge branch 'PHP-8.3' into PHP-8.4"
cmb69 Nov 20, 2024
7b99da4
Merge branch 'PHP-8.4'
cmb69 Nov 20, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 0 additions & 31 deletions .cirrus.yml

This file was deleted.

104 changes: 104 additions & 0 deletions .github/actions/freebsd/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
name: FreeBSD
runs:
using: composite
steps:
- name: FreeBSD
uses: vmactions/freebsd-vm@v1
with:
release: '13.3'
usesh: true
# Temporarily disable sqlite, as FreeBSD ships it with disabled double quotes. We'll need to fix our tests.
# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=269889
prepare: |
cd $GITHUB_WORKSPACE

kldload accf_http
pkg install -y \
autoconf \
bison \
gmake \
re2c \
icu \
libiconv \
png \
freetype2 \
enchant2 \
bzip2 \
t1lib \
gmp \
tidyp \
libsodium \
libzip \
libxml2 \
libxslt \
openssl \
oniguruma \
pkgconf \
webp \
libavif \
`#sqlite3` \
curl

./buildconf -f
./configure \
--prefix=/usr/local \
--enable-debug \
--enable-option-checking=fatal \
--enable-fpm \
`#--with-pdo-sqlite` \
--without-sqlite3 \
--without-pdo-sqlite \
--without-pear \
--with-bz2 \
--with-avif \
--with-jpeg \
--with-webp \
--with-freetype \
--enable-gd \
--enable-exif \
--with-zip \
--with-zlib \
--enable-soap \
--enable-xmlreader \
--with-xsl \
--with-libxml \
--enable-shmop \
--enable-pcntl \
--enable-mbstring \
--with-curl \
--enable-sockets \
--with-openssl \
--with-iconv=/usr/local \
--enable-bcmath \
--enable-calendar \
--enable-ftp \
--with-ffi \
--enable-zend-test \
--enable-dl-test=shared \
--enable-intl \
--with-mhash \
--with-sodium \
--enable-werror \
--with-config-file-path=/etc \
--with-config-file-scan-dir=/etc/php.d
gmake -j2
mkdir /etc/php.d
gmake install > /dev/null
echo opcache.enable_cli=1 > /etc/php.d/opcache.ini
echo opcache.protect_memory=1 >> /etc/php.d/opcache.ini
echo opcache.preload_user=root >> /etc/php.d/opcache.ini
run: |
cd $GITHUB_WORKSPACE

export SKIP_IO_CAPTURE_TESTS=1
export CI_NO_IPV6=1
export STACK_LIMIT_DEFAULTS_CHECK=1
sapi/cli/php run-tests.php \
-P -q -j2 \
-g FAIL,BORK,LEAK,XLEAK \
--no-progress \
--offline \
--show-diff \
--show-slow 1000 \
--set-timeout 120 \
-d zend_extension=opcache.so
12 changes: 12 additions & 0 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -814,12 +814,14 @@ jobs:
with:
withMysqli: ${{ inputs.libmysqlclient_with_mysqli }}
- name: Build mysql-8.4
if: ${{ !inputs.libmysqlclient_with_mysqli }}
uses: ./.github/actions/build-libmysqlclient
with:
configurationParameters: ${{ !inputs.libmysqlclient_with_mysqli && '--enable-werror' || '' }}
libmysql: mysql-8.4.0-linux-glibc2.28-x86_64.tar.xz
withMysqli: ${{ inputs.libmysqlclient_with_mysqli }}
- name: Test mysql-8.4
if: ${{ !inputs.libmysqlclient_with_mysqli }}
uses: ./.github/actions/test-libmysqlclient
with:
withMysqli: ${{ inputs.libmysqlclient_with_mysqli }}
Expand Down Expand Up @@ -979,3 +981,13 @@ jobs:
run: .github/scripts/windows/build.bat
- name: Test
run: .github/scripts/windows/test.bat
FREEBSD:
name: FREEBSD
runs-on: ubuntu-latest
steps:
- name: git checkout
uses: actions/checkout@v4
with:
ref: ${{ inputs.branch }}
- name: FreeBSD
uses: ./.github/actions/freebsd
8 changes: 8 additions & 0 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -359,3 +359,11 @@ jobs:
name: profiles
path: ${{ github.workspace }}/benchmark/profiles
retention-days: 30
FREEBSD:
name: FREEBSD
runs-on: ubuntu-latest
steps:
- name: git checkout
uses: actions/checkout@v4
- name: FreeBSD
uses: ./.github/actions/freebsd
5 changes: 5 additions & 0 deletions ext/standard/tests/file/file_put_contents_variation7.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
Test file_put_contents() function : usage variation - various absolute and relative paths
--CREDITS--
Dave Kelsey <[email protected]>
--SKIPIF--
<?php
if(substr(PHP_OS, 0, 3) == "WIN")
die("skip Not for Windows");
?>
--FILE--
<?php
echo "*** Testing file_put_contents() : usage variation ***\n";
Expand Down