From 5b48c4ca98e2c0cb4f9a06c72f4b938ba3350eda Mon Sep 17 00:00:00 2001 From: Ilija Tovilo Date: Mon, 6 Mar 2023 16:18:18 +0100 Subject: [PATCH] Move ARM64 build to Cirrus Travis is very unreliable lately --- .cirrus.yml | 205 +++++++++++++++++- .github/workflows/push.yml | 4 + .travis.yml | 4 - .../tests/pdo_mysql___construct.phpt | 1 + ext/standard/tests/file/bug52820.phpt | 2 + .../tests/file/disk_free_space_basic.phpt | 1 + 6 files changed, 208 insertions(+), 9 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index f2db9f81aa50..44c38f9131ec 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,12 +1,12 @@ env: CIRRUS_CLONE_DEPTH: 1 - ARCH: amd64 -freebsd_instance: - image_family: freebsd-13-0 - -task: +freebsd_task: name: FREEBSD_DEBUG_NTS + freebsd_instance: + image_family: freebsd-13-0 + env: + ARCH: amd64 install_script: #- sed -i -e 's/quarterly/latest/g' /etc/pkg/FreeBSD.conf #- pkg upgrade -y @@ -26,3 +26,198 @@ task: - export SKIP_IO_CAPTURE_TESTS=1 - export CI_NO_IPV6=1 - sapi/cli/php run-tests.php -P -q -j2 -g FAIL,XFAIL,BORK,WARN,LEAK,XLEAK,SKIP --offline --show-diff --show-slow 1000 --set-timeout 120 -d zend_extension=opcache.so + +arm_task: + name: ARM_DEBUG_NTS + arm_container: + image: gcc:10 + additional_containers: + - name: mysql + image: mysql:8 + port: 3306 + cpu: 1.0 + memory: 1G + env: + MYSQL_ALLOW_EMPTY_PASSWORD: true + MYSQL_ROOT_PASSWORD: "" + MYSQL_DATABASE: "test" + - name: postgres + image: postgres:latest + port: 5432 + env: + POSTGRES_PASSWORD: "postgres" + POSTGRES_DB: "test" + install_script: + - export DEBIAN_FRONTEND=noninteractive + - apt-get update -y + - >- + apt-get install -y + bison + re2c + locales + locales-all + ldap-utils + openssl + slapd + libgmp-dev + libicu-dev + libtidy-dev + libenchant-dev + libaspell-dev + libpspell-dev + libsasl2-dev + libxpm-dev + libzip-dev + libsqlite3-dev + libwebp-dev + libonig-dev + libkrb5-dev + libgssapi-krb5-2 + libcurl4-openssl-dev + libxml2-dev + libxslt1-dev + libpq-dev + libreadline-dev + libldap2-dev + libsodium-dev + libargon2-0-dev + libmm-dev + libsnmp-dev + snmpd + `#snmp-mibs-downloader` + freetds-dev + `#unixodbc-dev` + libc-client-dev + dovecot-core + dovecot-pop3d + dovecot-imapd + sendmail + firebird-dev + liblmdb-dev + libtokyocabinet-dev + libdb-dev + libqdbm-dev + libjpeg-dev + libpng-dev + libfreetype6-dev + build_script: + - ./buildconf -f + - >- + ./configure + --enable-debug + --enable-zts + --enable-option-checking=fatal + --prefix=/usr + --enable-phpdbg + --enable-fpm + --enable-opcache + --with-pdo-mysql=mysqlnd + --with-mysqli=mysqlnd + --with-pgsql + --with-pdo-pgsql + --with-pdo-sqlite + --enable-intl + --without-pear + --enable-gd + --with-jpeg + --with-webp + --with-freetype + --with-xpm + --enable-exif + --with-zip + --with-zlib + --with-zlib-dir=/usr + --enable-soap + --enable-xmlreader + --with-xsl + --with-tidy + --enable-sysvsem + --enable-sysvshm + --enable-shmop + --enable-pcntl + --with-readline + --enable-mbstring + --with-curl + --with-gettext + --enable-sockets + --with-bz2 + --with-openssl + --with-gmp + --enable-bcmath + --enable-calendar + --enable-ftp + --with-pspell=/usr + --with-enchant=/usr + --with-kerberos + --enable-sysvmsg + --with-ffi + --enable-zend-test + --enable-dl-test=shared + --with-ldap + --with-ldap-sasl + --with-password-argon2 + --with-mhash + --with-sodium + --enable-dba + --with-cdb + --enable-flatfile + --enable-inifile + --with-tcadb + --with-lmdb + --with-qdbm + --with-snmp + `#--with-unixODBC` + --with-imap + --with-kerberos + --with-imap-ssl + `#--with-pdo-odbc=unixODBC,/usr` + `#--with-pdo-oci=shared,instantclient,/opt/oracle/instantclient` + `#--with-oci8=shared,instantclient,/opt/oracle/instantclient` + --with-config-file-path=/etc + --with-config-file-scan-dir=/etc/php.d + --with-pdo-firebird + `#--with-pdo-dblib` + --disable-phpdbg + `#--enable-werror` + - make -j2 > /dev/null + - make install + - mkdir -p /etc/php.d + - echo opcache.enable_cli=1 > /etc/php.d/opcache.ini + - echo opcache.protect_memory=1 >> /etc/php.d/opcache.ini + # Specify opcache.preload_user as we're running as root. + - echo opcache.preload_user=root >> /etc/php.d/opcache.ini + tests_script: + - export SKIP_IO_CAPTURE_TESTS=1 + - export CI_NO_IPV6=1 + - export MYSQL_TEST_HOST=127.0.0.1 + - export MYSQL_TEST_USER=root + - export MYSQL_TEST_PASSWD= + - export PDO_MYSQL_TEST_DSN="mysql:host=127.0.0.1;dbname=test" + - export PDO_MYSQL_TEST_USER=root + - export PDO_MYSQL_TEST_PASS= + - export PDO_PGSQL_TEST_DSN="pgsql:host=127.0.0.1 port=5432 dbname=test user=postgres password=postgres" + - >- + sapi/cli/php run-tests.php + -d zend_extension=opcache.so + -d opcache.enable_cli=1 + -d opcache.jit_buffer_size=16M + -d opcache.jit=function + -P -q -x -j2 + -g PASS,FAIL,BORK,LEAK,XLEAK,SKIP + --offline + --show-diff + --show-slow 1000 + --set-timeout 120 + - >- + sapi/cli/php run-tests.php + -d zend_extension=opcache.so + -d opcache.enable_cli=1 + -d opcache.jit_buffer_size=16M + -d opcache.jit=tracing + -P -q -x -j2 + -g PASS,FAIL,BORK,LEAK,XLEAK,SKIP + --offline + --show-diff + --show-slow 1000 + --set-timeout 120 + --repeat 2 diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 4e92d3ebdb5f..751fcecba494 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -25,6 +25,7 @@ env: CXX: ccache g++ jobs: LINUX_X64: + if: false strategy: fail-fast: false matrix: @@ -76,6 +77,7 @@ jobs: - name: Verify generated files are up to date uses: ./.github/actions/verify-generated-files LINUX_X32: + if: false name: LINUX_X32_DEBUG_ZTS runs-on: ubuntu-latest container: @@ -122,6 +124,7 @@ jobs: -d opcache.enable_cli=1 -d opcache.jit_buffer_size=16M MACOS_DEBUG_NTS: + if: false runs-on: macos-11 steps: - name: git checkout @@ -156,6 +159,7 @@ jobs: - name: Verify generated files are up to date uses: ./.github/actions/verify-generated-files WINDOWS: + if: false strategy: fail-fast: false matrix: diff --git a/.travis.yml b/.travis.yml index d5032d20ff5a..9f764251afff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -68,8 +68,6 @@ env: jobs: include: - - env: ENABLE_ZTS=1 ENABLE_DEBUG=1 ARM64=1 - arch: arm64 - env: ENABLE_ZTS=1 ENABLE_DEBUG=1 S390X=1 arch: s390x @@ -88,8 +86,6 @@ before_script: # Run PHPs run-tests.php script: - ./travis/test.sh -d opcache.jit_buffer_size=16M -d opcache.jit=tracing - - if [[ "$ARM64" == 1 ]]; then ./travis/test.sh -d opcache.jit_buffer_size=16M -d opcache.jit=function; fi - - if [[ "$ARM64" == 1 ]]; then ./travis/test.sh -d opcache.jit_buffer_size=16M -d opcache.jit=tracing --repeat 2; fi - sapi/cli/php -d extension_dir=`pwd`/modules -r 'dl("zend_test");' after_success: diff --git a/ext/pdo_mysql/tests/pdo_mysql___construct.phpt b/ext/pdo_mysql/tests/pdo_mysql___construct.phpt index bf70cad4fce7..1f009185267c 100644 --- a/ext/pdo_mysql/tests/pdo_mysql___construct.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql___construct.phpt @@ -6,6 +6,7 @@ pdo_mysql --FILE-- --FILE-- --INI-- memory_limit=32M