Skip to content

FreeBSD CI image update. #13051

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,19 @@ env:
freebsd_task:
name: FREEBSD_DEBUG_NTS
freebsd_instance:
image_family: freebsd-13-3
image_family: freebsd-14-0
env:
ARCH: amd64
install_script:
#- sed -i -e 's/quarterly/latest/g' /etc/pkg/FreeBSD.conf
#- pkg upgrade -y
- kldload accf_http
- sysctl hw.ncpu
- 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
script:
- ./buildconf -f
- ./configure --prefix=/usr/local --enable-debug --enable-option-checking=fatal --enable-fpm --with-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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think Cirrus reported way too many cores in the past. We should make sure that's not the case again.

- gmake -j$(sysctl -n hw.ncpu) > /dev/null
- mkdir /etc/php.d
- gmake install
- echo opcache.enable_cli=1 > /etc/php.d/opcache.ini
Expand All @@ -26,4 +27,4 @@ freebsd_task:
- 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
- sapi/cli/php run-tests.php -P -q -j2 -g FAIL,BORK,LEAK,XLEAK --offline --show-diff --show-slow 1000 --set-timeout 120 -d zend_extension=opcache.so
4 changes: 4 additions & 0 deletions ext/sockets/tests/socket_sentto_recvfrom_unix.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ sockets
if (substr(PHP_OS, 0, 3) == 'WIN') {
die('skip.. Not valid for Windows');
}
// FreeBSD 14 bug ? even with non-sense protocol socket_create here does not warn
if (PHP_OS == 'FreeBSD') {
die('skip.. warning not triggered on freebsd');
}
?>
--FILE--
<?php
Expand Down
6 changes: 1 addition & 5 deletions ext/sockets/tests/socket_tcp_congestion.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,7 @@ if (!defined('TCP_CONGESTION')) {
--FILE--
<?php

if (str_contains(PHP_OS, 'Linux')) {
$algo = 'cubic';
} else {
$algo = 'newreno';
}
$algo = 'cubic';
$socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
if (!$socket) die ("socket failed");
$r = socket_get_option($socket, SOL_TCP, TCP_CONGESTION);
Expand Down
2 changes: 1 addition & 1 deletion ext/standard/tests/strings/setlocale_variation2.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ echo "-- Test setlocale() with all available locale in the system --\n";
// try n set each locale using setlocale() and keep track failures, if any
foreach($all_system_locales as $value){
//set locale to $value, if success, count increments
if(setlocale(LC_ALL,$value )){
if(setlocale(LC_CTYPE,$value )){
$success_count++;
}
else{
Expand Down