diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-10-25 16:38:13 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-10-25 16:38:13 +0200 |
| commit | 75279b50a56994cf3a58fcd25a25b7aa21e53ced (patch) | |
| tree | bef2ed87d6f364d6831400f49e8371924757ca7a /travis | |
| parent | e63a44dd03aae264561fff77565f4a5f9be035bd (diff) | |
| parent | bd379df48c1568b19d267f642154f386bd864cba (diff) | |
| download | php-git-75279b50a56994cf3a58fcd25a25b7aa21e53ced.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Add ARM64 CI to Travis
Diffstat (limited to 'travis')
| -rwxr-xr-x | travis/compile.sh | 7 | ||||
| -rwxr-xr-x | travis/setup-mysql.sh | 4 | ||||
| -rwxr-xr-x | travis/setup-pgsql.sh | 4 |
3 files changed, 10 insertions, 5 deletions
diff --git a/travis/compile.sh b/travis/compile.sh index e4706e0f96..a3d3e62578 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 |