Skip to content

Commit bd379df

Browse files
committed
Add ARM64 CI to Travis
We need to install a number of additional packages that are installed by default on the AMD64 workers. We also have to manually set up the MySQL user. For now we don't set up Postgres -- if anyone wants to figure that out, it would be great ;) Log redirections in compile.sh are removed, because /dev/stdout is not accessible. We don't see to use this anyway.
1 parent f1848a4 commit bd379df

File tree

4 files changed

+36
-14
lines changed

4 files changed

+36
-14
lines changed

.travis.yml

+26-9
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,29 @@ addons:
1010
- locales
1111
- language-pack-de
1212
- re2c
13+
- ccache
14+
- mysql-server
15+
- libaspell-dev
16+
- libbz2-dev
17+
- libcurl4-gnutls-dev
18+
- libenchant-dev
19+
- libfreetype6-dev
1320
- libgmp-dev
1421
- libicu-dev
15-
- libtidy-dev
16-
- libenchant-dev
17-
- libaspell-dev
22+
- libjpeg-dev
23+
- libkrb5-dev
24+
- libonig-dev
25+
- libpng-dev
26+
- libpq-dev
1827
- libpspell-dev
1928
- libsasl2-dev
20-
- libxpm-dev
21-
- libzip-dev
2229
- libsqlite3-dev
30+
- libtidy-dev
2331
- libwebp-dev
24-
- libonig-dev
32+
- libxml2-dev
33+
- libxpm-dev
34+
- libxslt1-dev
35+
- libzip-dev
2536

2637

2738
services:
@@ -53,9 +64,15 @@ env:
5364
- PDO_MYSQL_TEST_HOST=127.0.0.1
5465
- PDO_PGSQL_TEST_DSN="pgsql:host=localhost port=5432 dbname=test user=postgres password="
5566
- REPORT_EXIT_STATUS=1
56-
matrix:
57-
- ENABLE_MAINTAINER_ZTS=0 ENABLE_DEBUG=0
58-
- ENABLE_MAINTAINER_ZTS=1 ENABLE_DEBUG=1
67+
68+
jobs:
69+
include:
70+
- env: ENABLE_MAINTAINER_ZTS=0 ENABLE_DEBUG=0
71+
arch: amd64
72+
- env: ENABLE_MAINTAINER_ZTS=1 ENABLE_DEBUG=1
73+
arch: amd64
74+
- env: ENABLE_MAINTAINER_ZTS=1 ENABLE_DEBUG=1 SKIP_IO_CAPTURE_TESTS=1 ARM64=1
75+
arch: arm64
5976

6077
before_script:
6178
- ccache --version

travis/compile.sh

+3-4
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,7 @@ $TS \
7777
--with-ffi \
7878
--enable-zend-test=shared \
7979
--enable-werror \
80-
--with-pear \
81-
> "$CONFIG_LOG_FILE"
80+
--with-pear
8281

83-
make "-j${MAKE_JOBS}" $MAKE_QUIET > "$MAKE_LOG_FILE"
84-
make install >> "$MAKE_LOG_FILE"
82+
make "-j${MAKE_JOBS}" $MAKE_QUIET
83+
make install

travis/setup-mysql.sh

+4
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
11
#!/bin/bash
2+
if [ -n "$ARM64" ]; then
3+
sudo mysql -e 'CREATE USER "travis"@"localhost" IDENTIFIED BY ""'
4+
sudo mysql -e 'GRANT ALL PRIVILEGES ON *.* TO "travis"@"localhost"'
5+
fi
26
mysql -e "CREATE DATABASE IF NOT EXISTS test"

travis/setup-pgsql.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
#!/bin/bash
22
echo '
33
<?php $conn_str .= " user=postgres"; ?>' >> "./ext/pgsql/tests/config.inc"
4-
psql -c 'create database test;' -U postgres
4+
if [ -z "$ARM64" ]; then
5+
psql -c 'create database test;' -U postgres
6+
fi

0 commit comments

Comments
 (0)