Skip to content

Commit 94853b6

Browse files
committed
Merge branch 'PHP-8.3' into PHP-8.4
* PHP-8.3: Backport .github changes for Solaris
2 parents 2fb1411 + eee7c0a commit 94853b6

3 files changed

Lines changed: 107 additions & 0 deletions

File tree

.github/actions/solaris/action.yml

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
name: Solaris
2+
inputs:
3+
configurationParameters:
4+
default: ''
5+
required: false
6+
runExtraTests:
7+
default: false
8+
required: false
9+
runs:
10+
using: composite
11+
steps:
12+
- name: Solaris
13+
uses: vmactions/solaris-vm@v1
14+
with:
15+
release: "11.4-gcc"
16+
usesh: true
17+
copyback: false
18+
disable-cache: true
19+
prepare: |
20+
cd $GITHUB_WORKSPACE
21+
pkg install bison developer/icu libzip oniguruma re2c
22+
23+
./buildconf -f
24+
CC=gcc CXX=g++ \
25+
CFLAGS="-Wno-char-subscripts" \
26+
PATH=/usr/gnu/bin:/usr/bin \
27+
PKG_CONFIG_PATH=/usr/lib/amd64/pkgconfig \
28+
./configure \
29+
--prefix=/usr/local \
30+
--enable-debug \
31+
--enable-werror \
32+
--enable-option-checking=fatal \
33+
--enable-fpm \
34+
--without-pear \
35+
--with-bz2 \
36+
--with-jpeg \
37+
--with-webp \
38+
--with-freetype \
39+
--enable-gd \
40+
--enable-exif \
41+
--with-zip \
42+
--with-zlib \
43+
--enable-soap \
44+
--enable-xmlreader \
45+
--with-xsl \
46+
--with-libxml \
47+
--enable-shmop \
48+
--enable-pcntl \
49+
--enable-mbstring \
50+
--with-curl \
51+
--enable-sockets \
52+
--with-openssl \
53+
--enable-bcmath \
54+
--enable-calendar \
55+
--enable-ftp \
56+
--enable-zend-test \
57+
--enable-dl-test=shared \
58+
--enable-intl \
59+
--with-mhash \
60+
--with-config-file-path=/etc \
61+
--with-config-file-scan-dir=/etc/php.d \
62+
${{ inputs.configurationParameters }}
63+
64+
gmake -j2
65+
mkdir /etc/php.d
66+
gmake install > /dev/null
67+
echo opcache.enable_cli=1 > /etc/php.d/opcache.ini
68+
echo opcache.protect_memory=1 >> /etc/php.d/opcache.ini
69+
echo opcache.preload_user=root >> /etc/php.d/opcache.ini
70+
run: |
71+
cd $GITHUB_WORKSPACE
72+
73+
export SKIP_IO_CAPTURE_TESTS=1
74+
export CI_NO_IPV6=1
75+
export STACK_LIMIT_DEFAULTS_CHECK=1
76+
PATH=/usr/gnu/bin:/usr/bin \
77+
sapi/cli/php run-tests.php \
78+
-P -q -j1 \
79+
-g FAIL,BORK,LEAK,XLEAK \
80+
--no-progress \
81+
--offline \
82+
--show-diff \
83+
--show-slow 1000 \
84+
--set-timeout 120
85+
86+
if test "${{ inputs.runExtraTests }}" = "true"; then
87+
sapi/cli/php run-extra-tests.php
88+
fi

.github/matrix.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ function select_jobs($repository, $trigger, $nightly, $labels, $php_version, $re
6262
$test_msan = in_array('CI: MSAN', $labels, true);
6363
$test_opcache_variation = in_array('CI: Opcache Variation', $labels, true);
6464
$test_pecl = in_array('CI: PECL', $labels, true);
65+
$test_solaris = in_array('CI: Solaris', $labels, true);
6566
$test_windows = in_array('CI: Windows', $labels, true);
6667

6768
$jobs = [];
@@ -132,6 +133,9 @@ function select_jobs($repository, $trigger, $nightly, $labels, $php_version, $re
132133
if (($all_jobs && $ref === 'master') || $test_pecl) {
133134
$jobs['PECL'] = true;
134135
}
136+
if (version_compare($php_version, '8.6', '>=') && ($all_jobs || $test_solaris)) {
137+
$jobs['SOLARIS'] = true;
138+
}
135139
if ($all_jobs || !$no_jobs || $test_windows) {
136140
$jobs['WINDOWS']['matrix'] = $all_variations
137141
? ['include' => [

.github/workflows/test-suite.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -979,6 +979,21 @@ jobs:
979979
configurationParameters: >-
980980
--${{ matrix.zts && 'enable' || 'disable' }}-zts
981981
runExtraTests: true
982+
SOLARIS:
983+
if: ${{ fromJson(inputs.branch).jobs.SOLARIS }}
984+
name: "SOLARIS"
985+
runs-on: ubuntu-latest
986+
timeout-minutes: 50
987+
steps:
988+
- name: git checkout
989+
uses: actions/checkout@v5
990+
with:
991+
ref: ${{ fromJson(inputs.branch).ref }}
992+
- name: Solaris
993+
uses: ./.github/actions/solaris
994+
with:
995+
configurationParameters: --disable-zts
996+
runExtraTests: true
982997
BENCHMARKING:
983998
name: BENCHMARKING
984999
if: ${{ fromJson(inputs.branch).jobs.BENCHMARKING }}

0 commit comments

Comments
 (0)