diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-10-23 12:58:21 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-10-25 16:37:46 +0200 |
| commit | bd379df48c1568b19d267f642154f386bd864cba (patch) | |
| tree | d86b152eb5495fc49073c75b894d65201c3b98e6 | |
| parent | f1848a4b3f807d21415c5a334b461d240b2a83af (diff) | |
| download | php-git-bd379df48c1568b19d267f642154f386bd864cba.tar.gz | |
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.
| -rw-r--r-- | .travis.yml | 35 | ||||
| -rwxr-xr-x | travis/compile.sh | 7 | ||||
| -rwxr-xr-x | travis/setup-mysql.sh | 4 | ||||
| -rwxr-xr-x | travis/setup-pgsql.sh | 4 |
4 files changed, 36 insertions, 14 deletions
diff --git a/.travis.yml b/.travis.yml index cbc75370fb..c408d260cd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,18 +10,29 @@ addons: - locales - language-pack-de - re2c + - ccache + - mysql-server + - libaspell-dev + - libbz2-dev + - libcurl4-gnutls-dev + - libenchant-dev + - libfreetype6-dev - libgmp-dev - libicu-dev - - libtidy-dev - - libenchant-dev - - libaspell-dev + - libjpeg-dev + - libkrb5-dev + - libonig-dev + - libpng-dev + - libpq-dev - libpspell-dev - libsasl2-dev - - libxpm-dev - - libzip-dev - libsqlite3-dev + - libtidy-dev - libwebp-dev - - libonig-dev + - libxml2-dev + - libxpm-dev + - libxslt1-dev + - libzip-dev services: @@ -53,9 +64,15 @@ env: - PDO_MYSQL_TEST_HOST=127.0.0.1 - PDO_PGSQL_TEST_DSN="pgsql:host=localhost port=5432 dbname=test user=postgres password=" - REPORT_EXIT_STATUS=1 - matrix: - - ENABLE_MAINTAINER_ZTS=0 ENABLE_DEBUG=0 - - ENABLE_MAINTAINER_ZTS=1 ENABLE_DEBUG=1 + +jobs: + include: + - env: ENABLE_MAINTAINER_ZTS=0 ENABLE_DEBUG=0 + arch: amd64 + - env: ENABLE_MAINTAINER_ZTS=1 ENABLE_DEBUG=1 + arch: amd64 + - env: ENABLE_MAINTAINER_ZTS=1 ENABLE_DEBUG=1 SKIP_IO_CAPTURE_TESTS=1 ARM64=1 + arch: arm64 before_script: - ccache --version diff --git a/travis/compile.sh b/travis/compile.sh index e373d9b90c..d14309a0dd 100755 --- a/travis/compile.sh +++ b/travis/compile.sh @@ -77,8 +77,7 @@ $TS \ --with-ffi \ --enable-zend-test=shared \ --enable-werror \ ---with-pear \ -> "$CONFIG_LOG_FILE" +--with-pear -make "-j${MAKE_JOBS}" $MAKE_QUIET > "$MAKE_LOG_FILE" -make install >> "$MAKE_LOG_FILE" +make "-j${MAKE_JOBS}" $MAKE_QUIET +make install diff --git a/travis/setup-mysql.sh b/travis/setup-mysql.sh index a3ba75cb2d..4866f24442 100755 --- a/travis/setup-mysql.sh +++ b/travis/setup-mysql.sh @@ -1,2 +1,6 @@ #!/bin/bash +if [ -n "$ARM64" ]; then + sudo mysql -e 'CREATE USER "travis"@"localhost" IDENTIFIED BY ""' + sudo mysql -e 'GRANT ALL PRIVILEGES ON *.* TO "travis"@"localhost"' +fi mysql -e "CREATE DATABASE IF NOT EXISTS test" diff --git a/travis/setup-pgsql.sh b/travis/setup-pgsql.sh index 108f47db25..9172356265 100755 --- a/travis/setup-pgsql.sh +++ b/travis/setup-pgsql.sh @@ -1,4 +1,6 @@ #!/bin/bash echo ' <?php $conn_str .= " user=postgres"; ?>' >> "./ext/pgsql/tests/config.inc" -psql -c 'create database test;' -U postgres +if [ -z "$ARM64" ]; then + psql -c 'create database test;' -U postgres +fi |