]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Fri, 25 Oct 2019 14:38:13 +0000 (16:38 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Fri, 25 Oct 2019 14:38:13 +0000 (16:38 +0200)
* PHP-7.4:
  Add ARM64 CI to Travis

1  2 
.travis.yml
travis/compile.sh

diff --cc .travis.yml
index b25be33238dae1fe90e19208e528e1c79f29902b,c408d260cd1186b6f7ce98379fb8a68305e2129e..2c991431bf9cdb992d2560e835681d0f21c26066
@@@ -53,9 -64,15 +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_ZTS=0 ENABLE_DEBUG=0
-       - ENABLE_ZTS=1 ENABLE_DEBUG=1
+ jobs:
+     include:
 -        - env: ENABLE_MAINTAINER_ZTS=0 ENABLE_DEBUG=0
++        - env: ENABLE_ZTS=0 ENABLE_DEBUG=0
+           arch: amd64
 -        - env: ENABLE_MAINTAINER_ZTS=1 ENABLE_DEBUG=1
++        - env: ENABLE_ZTS=1 ENABLE_DEBUG=1
+           arch: amd64
 -        - env: ENABLE_MAINTAINER_ZTS=1 ENABLE_DEBUG=1 SKIP_IO_CAPTURE_TESTS=1 ARM64=1
++        - env: ENABLE_ZTS=1 ENABLE_DEBUG=1 SKIP_IO_CAPTURE_TESTS=1 ARM64=1
+           arch: arm64
  
  before_script:
      - ccache --version
Simple merge