From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 25 Oct 2019 14:38:13 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=75279b50a56994cf3a58fcd25a25b7aa21e53ced;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Add ARM64 CI to Travis
---

75279b50a56994cf3a58fcd25a25b7aa21e53ced
diff --cc .travis.yml
index b25be33238,c408d260cd..2c991431bf
--- a/.travis.yml
+++ b/.travis.yml
@@@ -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