Skip to content

Commit 3ff489d

Browse files
krakjoekrakjoe
committed
Merge branch 'i386-azure' into PHP-7.4
* i386-azure: i386 build
2 parents 5c8b702 + c2a78c7 commit 3ff489d

File tree

5 files changed

+206
-10
lines changed

5 files changed

+206
-10
lines changed

‎azure-pipelines.yml

+24-8
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,38 @@ trigger:
66
- master
77

88
jobs:
9-
- template: azure/job.yml
10-
parameters:
11-
configurationName: RELEASE_NTS
12-
configurationParameters: '--disable-debug --disable-maintainer-zts'
9+
# - template: azure/job.yml
10+
# parameters:
11+
# configurationName: RELEASE_NTS
12+
# configurationParameters: '--disable-debug --disable-maintainer-zts'
1313
- template: azure/job.yml
1414
parameters:
1515
configurationName: DEBUG_NTS
1616
configurationParameters: '--enable-debug --disable-maintainer-zts'
17-
- template: azure/job.yml
18-
parameters:
19-
configurationName: RELEASE_ZTS
20-
configurationParameters: '--disable-debug --enable-maintainer-zts'
17+
# - template: azure/job.yml
18+
# parameters:
19+
# configurationName: RELEASE_ZTS
20+
# configurationParameters: '--disable-debug --enable-maintainer-zts'
2121
- template: azure/job.yml
2222
parameters:
2323
configurationName: DEBUG_ZTS
2424
configurationParameters: '--enable-debug --enable-maintainer-zts'
25+
# - template: azure/i386/job.yml
26+
# parameters:
27+
# configurationName: I386_RELEASE_NTS
28+
# configurationParameters: '--disable-debug --disable-maintainer-zts'
29+
- template: azure/i386/job.yml
30+
parameters:
31+
configurationName: I386_DEBUG_NTS
32+
configurationParameters: '--enable-debug --disable-maintainer-zts'
33+
# - template: azure/i386/job.yml
34+
# parameters:
35+
# configurationName: I386_RELEASE_ZTS
36+
# configurationParameters: '--disable-debug --enable-maintainer-zts'
37+
- template: azure/i386/job.yml
38+
parameters:
39+
configurationName: I386_DEBUG_ZTS
40+
configurationParameters: '--enable-debug --enable-maintainer-zts'
2541
- template: azure/macos/job.yml
2642
parameters:
2743
configurationName: MACOS_DEBUG_NTS

‎azure/i386/apt.yml

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
parameters:
2+
packages: ''
3+
4+
steps:
5+
- script: |
6+
sudo dpkg --add-architecture i386
7+
sudo apt-get update -y | true
8+
sudo apt-get install -y gcc-multilib
9+
sudo apt-get install -y g++-multilib
10+
sudo apt-get install -y valgrind:i386
11+
sudo apt-get install -y bison \
12+
re2c \
13+
locales \
14+
language-pack-de \
15+
libglib2.0-dev:i386 \
16+
openssl:i386 \
17+
zlib1g-dev:i386 \
18+
libxml2-dev:i386 \
19+
libgmp-dev:i386 \
20+
libicu-dev:i386 \
21+
libtidy-dev:i386 \
22+
libenchant-dev:i386 \
23+
libaspell-dev:i386 \
24+
libpspell-dev:i386 \
25+
librecode-dev:i386 \
26+
libsasl2-dev:i386 \
27+
libxpm-dev:i386 \
28+
libjpeg-dev:i386 \
29+
libpng-dev:i386 \
30+
libzip-dev:i386 \
31+
libbz2-dev:i386 \
32+
libsqlite3-dev:i386 \
33+
libwebp-dev:i386 \
34+
libonig-dev:i386 \
35+
libkrb5-dev:i386 \
36+
libgssapi-krb5-2:i386 \
37+
libcurl4-openssl-dev:i386 \
38+
libxml2-dev:i386 \
39+
libxslt1-dev:i386 \
40+
libpq-dev:i386 \
41+
libreadline-dev:i386 \
42+
libffi-dev:i386 \
43+
libfreetype6-dev:i386 \
44+
postgresql \
45+
postgresql-contrib \
46+
${{ parameters.packages }}
47+
displayName: 'APT'

‎azure/i386/job.yml

+103
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
parameters:
2+
configurationName: ''
3+
configurationParameters: ''
4+
5+
jobs:
6+
- job: ${{ parameters.configurationName }}
7+
pool:
8+
vmImage: 'ubuntu-latest'
9+
steps:
10+
- checkout: self
11+
fetchDepth: 1
12+
- template: apt.yml
13+
- script: |
14+
./buildconf --force
15+
export CFLAGS=-m32
16+
export CXXFLAGS=-m32
17+
export LDFLAGS=-L/usr/lib/i386-linux-gnu
18+
export PKG_CONFIG=/usr/bin/i686-linux-gnu-pkg-config
19+
./configure ${{ parameters.configurationParameters }} \
20+
--prefix=/usr \
21+
--enable-phpdbg \
22+
--enable-fpm \
23+
--enable-intl \
24+
--with-pdo-mysql=mysqlnd \
25+
--with-mysqli=mysqlnd \
26+
--with-pgsql \
27+
--with-pdo-pgsql \
28+
--with-pdo-sqlite \
29+
--without-pear \
30+
--enable-gd \
31+
--with-jpeg \
32+
--with-webp \
33+
--with-freetype \
34+
--with-xpm \
35+
--enable-exif \
36+
--with-zip \
37+
--with-zlib \
38+
--with-zlib-dir=/usr \
39+
--enable-soap \
40+
--enable-xmlreader \
41+
--with-xsl \
42+
--with-tidy \
43+
--with-xmlrpc \
44+
--enable-sysvsem \
45+
--enable-sysvshm \
46+
--enable-shmop \
47+
--enable-pcntl \
48+
--with-readline \
49+
--enable-mbstring \
50+
--with-curl \
51+
--with-gettext \
52+
--enable-sockets \
53+
--with-bz2 \
54+
--with-openssl \
55+
--with-gmp \
56+
--enable-bcmath \
57+
--enable-calendar \
58+
--enable-ftp \
59+
--with-pspell=/usr \
60+
--with-enchant=/usr \
61+
--with-kerberos \
62+
--enable-sysvmsg \
63+
--with-ffi \
64+
--enable-zend-test \
65+
--with-config-file-path=/etc \
66+
--with-config-file-scan-dir=/etc/php.d
67+
displayName: 'Configure Build'
68+
- script: make -j$(/usr/bin/nproc) >/dev/null
69+
displayName: 'Make Build'
70+
- script: |
71+
sudo make install
72+
sudo mkdir /etc/php.d
73+
sudo chmod 777 /etc/php.d
74+
echo mysqli.default_socket=/var/run/mysqld/mysqld.sock > /etc/php.d/mysqli.ini
75+
echo pdo_mysql.default_socket=/var/run/mysqld/mysqld.sock > /etc/php.d/pdo_mysql.ini
76+
displayName: 'Install Build'
77+
- script: |
78+
mysql -uroot -proot -e "CREATE DATABASE IF NOT EXISTS test"
79+
sudo -u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';"
80+
sudo -u postgres psql -c "CREATE DATABASE test;"
81+
displayName: 'Setup'
82+
# - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: this will be uncommented on merge, we don't want to docker pull request builds
83+
- task: Docker@2
84+
inputs:
85+
containerRegistry: 'phpazuredevops'
86+
repository: ${{ variables['Build.SourceBranch'] }}
87+
command: 'buildAndPush'
88+
Dockerfile: '**/Dockerfile'
89+
tags: ${{ parameters.configurationName }}
90+
- template: test.yml
91+
parameters:
92+
configurationName: ${{ parameters.configurationName }}
93+
- template: test.yml
94+
parameters:
95+
configurationName: ${{ parameters.configurationName }}
96+
runTestsName: 'OpCache'
97+
runTestsParameters: -d zend_extension=opcache.so -d opcache.enable_cli=1
98+
- ${{ if ne(variables['Build.SourceBranch'], 'refs/heads/PHP-7.4') }}:
99+
- template: test.yml
100+
parameters:
101+
configurationName: ${{ parameters.configurationName }}
102+
runTestsName: 'JIT'
103+
runTestsParameters: -d zend_extension=opcache.so -d opcache.enable_cli=1 -d opcache.jit_buffer_size=16M

‎azure/i386/test.yml

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
parameters:
2+
runTestsName: ''
3+
runTestsParameters: ''
4+
5+
steps:
6+
- script: |
7+
export MYSQL_TEST_USER=root
8+
export MYSQL_TEST_PASSWD=root
9+
export PDO_MYSQL_TEST_DSN="mysql:host=localhost;dbname=test"
10+
export PDO_MYSQL_TEST_USER=root
11+
export PDO_MYSQL_TEST_PASS=root
12+
export TEST_PHP_JUNIT=junit.xml
13+
export REPORT_EXIT_STATUS=no
14+
export SKIP_IO_CAPTURE_TESTS=1
15+
rm -rf junit.xml | true
16+
php run-tests.php -P -q \
17+
-j$(/usr/bin/nproc) \
18+
-g FAIL,XFAIL,BORK,WARN,LEAK,XLEAK,SKIP \
19+
--offline \
20+
--show-slow 1000 \
21+
--set-timeout 120 \
22+
${{ parameters.runTestsParameters }}
23+
displayName: 'Test ${{ parameters.configurationName }} ${{ parameters.runTestsName }}'
24+
condition: or(succeeded(), failed())
25+
- task: PublishTestResults@2
26+
inputs:
27+
testResultsFormat: 'JUnit'
28+
testResultsFiles: junit.xml
29+
testRunTitle: '${{ parameters.configurationName }} ${{ parameters.runTestsName }}'
30+
failTaskOnFailedTests: false
31+
displayName: 'Export ${{ parameters.configurationName }} ${{ parameters.runTestsName }} Results'
32+
condition: or(succeeded(), failed())

‎ext/calendar/tests/unixtojd_error1.phpt

-2
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,9 @@ var_dump(unixtojd(-1)) . PHP_EOL;
1414
var_dump(unixtojd(false)) . PHP_EOL;
1515
var_dump(unixtojd(null)) . PHP_EOL;
1616
var_dump(unixtojd(time())) . PHP_EOL;
17-
var_dump(unixtojd(PHP_INT_MAX)) . PHP_EOL;
1817
?>
1918
--EXPECTF--
2019
bool(false)
2120
int(%d)
2221
int(%d)
2322
int(%d)
24-
bool(false)

0 commit comments

Comments
 (0)