From 13f041163cab068af09b1f0c359f440623228406 Mon Sep 17 00:00:00 2001 From: Peter Kokot Date: Wed, 4 Sep 2024 01:15:10 +0200 Subject: [PATCH] Remove Travis artefacts (#15714) Travis was suspended https://github.com/php/php-src/pull/15314 This removes 404 errored Travis image in README, travis configuration directory and YAML file and usages in tests. [skip ci] Co-authored-by: Gina Peter Banyard --- .github/workflows/push.yml | 4 - .travis.yml | 89 ------------------- CONTRIBUTING.md | 1 - README.md | 1 - docs/release-process.md | 1 - ext/gmp/tests/gmp_setbit_long.phpt | 1 - ext/pcntl/tests/pcntl_cpuaffinity.phpt | 1 - ext/pcntl/tests/pcntl_getcpu.phpt | 1 - .../tests/file/disk_free_space_basic.phpt | 1 - ext/zlib/tests/gzcompress_basic1.phpt | 2 - ext/zlib/tests/gzdeflate_basic1.phpt | 2 - ext/zlib/tests/gzencode_basic1.phpt | 2 - run-tests.php | 5 +- sapi/cli/tests/upload_2G.phpt | 4 - sapi/fpm/tests/tester.inc | 12 --- travis/compile.sh | 76 ---------------- travis/setup-mysql.sh | 4 - travis/setup-pgsql.sh | 8 -- travis/test.sh | 17 ---- 19 files changed, 1 insertion(+), 231 deletions(-) delete mode 100644 .travis.yml delete mode 100755 travis/compile.sh delete mode 100755 travis/setup-mysql.sh delete mode 100755 travis/setup-pgsql.sh delete mode 100755 travis/test.sh diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 086c5cc0347..63745e62877 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -10,8 +10,6 @@ on: - CONTRIBUTING.md - CODING_STANDARDS.md - .cirrus.yml - - .travis.yml - - travis/** - .circleci/** branches: - PHP-8.1 @@ -28,8 +26,6 @@ on: - CONTRIBUTING.md - CODING_STANDARDS.md - .cirrus.yml - - .travis.yml - - travis/** - .circleci/** branches: - '**' diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index fd18307662a..00000000000 --- a/.travis.yml +++ /dev/null @@ -1,89 +0,0 @@ -git: - quiet: true - -dist: focal -language: c -os: linux -addons: - apt: - packages: - - locales - - language-pack-de - - re2c - - ccache - - mysql-server - - libbz2-dev - - libcurl4-gnutls-dev - - libenchant-dev - - libfreetype6-dev - - libgmp-dev - - libicu-dev - - libjpeg-dev - - libonig-dev - - libpng-dev - - libpq-dev - - libsasl2-dev - - libsqlite3-dev - - libsodium-dev - - libtidy-dev - - libwebp-dev - - libxml2-dev - - libxpm-dev - - libxslt1-dev - - libzip-dev - - -services: - - mysql - - postgresql - -notifications: - email: - on_failure: change - irc: - template: - - "%{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message} - Change view : %{compare_url} - Build details : %{build_url}" - channels: - - "irc.efnet.org#php.pecl" - on_success: change - on_failure: always - -cache: - apt: true - ccache: true - -env: - global: - - MYSQL_TEST_HOST=127.0.0.1 - - MYSQL_TEST_USER=travis - - PDO_MYSQL_TEST_DSN="mysql:host=127.0.0.1;dbname=test" - - PDO_MYSQL_TEST_USER=travis - - PDO_MYSQL_TEST_PASS= - - 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 - -jobs: - include: - - env: ENABLE_ZTS=1 ENABLE_DEBUG=1 S390X=1 - arch: s390x - -before_script: - - ccache --version - - ccache --zero-stats - - export USE_CCACHE=1 - # Enable IPv6 - - sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6' - # Compile PHP - - travis_wait ./travis/compile.sh - # Setup Extensions - - ./travis/setup-mysql.sh - - ./travis/setup-pgsql.sh - -# Run PHPs run-tests.php -script: - - ./travis/test.sh -d opcache.jit=tracing -d opcache.jit_buffer_size=64M - - sapi/cli/php -d extension_dir=`pwd`/modules -r 'dl("zend_test");' - -after_success: - - ccache --show-stats diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 4efffc6ccdc..2318f896b7a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -238,7 +238,6 @@ locations. └─ ... ├─ scripts/ # php-config, phpize and internal development scripts ├─ tests/ # Core features tests - ├─ travis/ # Travis CI service files └─ win32/ # Windows build system files ├─ cp_enc_map.c # Generated by `win32/cp_enc_map_gen.exe` └─ ... diff --git a/README.md b/README.md index 4b22696cb3f..c5376f67725 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,6 @@ blog to the most popular websites in the world. PHP is distributed under the [PHP License v3.01](LICENSE). [![Push](https://github.com/php/php-src/actions/workflows/push.yml/badge.svg)](https://github.com/php/php-src/actions/workflows/push.yml) -[![Build status](https://travis-ci.com/php/php-src.svg?branch=master)](https://travis-ci.com/github/php/php-src) [![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/php.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:php) ## Documentation diff --git a/docs/release-process.md b/docs/release-process.md index 6c93fbdd539..46557524988 100644 --- a/docs/release-process.md +++ b/docs/release-process.md @@ -54,7 +54,6 @@ releases. 3. Ensure that the relevant tests on CI are green. - - https://travis-ci.com/github/php/php-src - https://cirrus-ci.com/github/php/php-src - https://github.com/php/php-src/actions diff --git a/ext/gmp/tests/gmp_setbit_long.phpt b/ext/gmp/tests/gmp_setbit_long.phpt index 08927e9a2ee..0be0b0e5137 100644 --- a/ext/gmp/tests/gmp_setbit_long.phpt +++ b/ext/gmp/tests/gmp_setbit_long.phpt @@ -3,7 +3,6 @@ gmp_setbit() with large index --EXTENSIONS-- gmp --SKIPIF-- - --FILE-- --FILE-- diff --git a/ext/standard/tests/file/disk_free_space_basic.phpt b/ext/standard/tests/file/disk_free_space_basic.phpt index 2723d0ed861..0d93effdd46 100644 --- a/ext/standard/tests/file/disk_free_space_basic.phpt +++ b/ext/standard/tests/file/disk_free_space_basic.phpt @@ -2,7 +2,6 @@ Test disk_free_space and its alias diskfreespace() functions : basic functionality --SKIPIF-- --INI-- diff --git a/ext/zlib/tests/gzcompress_basic1.phpt b/ext/zlib/tests/gzcompress_basic1.phpt index b37aebe33d7..8899deaed0f 100644 --- a/ext/zlib/tests/gzcompress_basic1.phpt +++ b/ext/zlib/tests/gzcompress_basic1.phpt @@ -2,8 +2,6 @@ Test gzcompress() function : basic functionality --EXTENSIONS-- zlib ---SKIPIF-- - --FILE-- --FILE-- --FILE-- [ "INIT_DIR" => INIT_DIR, "TEST_PHP_SRCDIR" => TEST_PHP_SRCDIR, - "TRAVIS_CI" => TRAVIS_CI ] ])) . "\n"; diff --git a/sapi/cli/tests/upload_2G.phpt b/sapi/cli/tests/upload_2G.phpt index 1cf883cd9d3..2b4729d4f86 100644 --- a/sapi/cli/tests/upload_2G.phpt +++ b/sapi/cli/tests/upload_2G.phpt @@ -32,10 +32,6 @@ if (empty($enough_free_ram)) { die(sprintf("skip need +3G free RAM, but only %01.2f available", $free_ram)); } -if (getenv('TRAVIS')) { - die("skip Fails intermittently on travis"); -} - if (getenv('CIRRUS_CI')) die('skip Fails on Cirrus'); if (getenv('SKIP_PERF_SENSITIVE')) { diff --git a/sapi/fpm/tests/tester.inc b/sapi/fpm/tests/tester.inc index 75c7c6d368f..bbd6394e213 100644 --- a/sapi/fpm/tests/tester.inc +++ b/sapi/fpm/tests/tester.inc @@ -296,18 +296,6 @@ class Tester } } - /** - * Skip if running on Travis. - * - * @param $message - */ - static public function skipIfTravis($message) - { - if (getenv("TRAVIS")) { - die('skip Travis: ' . $message); - } - } - /** * Skip if not running as root. */ diff --git a/travis/compile.sh b/travis/compile.sh deleted file mode 100755 index bab44d30ad1..00000000000 --- a/travis/compile.sh +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/bash -set -ex -if [[ "$ENABLE_ZTS" == 1 ]]; then - TS="--enable-zts"; -else - TS=""; -fi -if [[ "$ENABLE_DEBUG" == 1 ]]; then - DEBUG="--enable-debug"; -else - DEBUG=""; -fi -if [[ "$S390X" == 1 ]]; then - S390X_CONFIG="--without-pcre-jit"; -else - S390X_CONFIG=""; -fi - -./buildconf --force -./configure \ ---enable-option-checking=fatal \ ---prefix="$HOME"/php-install \ -$CONFIG_QUIET \ -$DEBUG \ -$TS \ -$S390X_CONFIG \ ---enable-phpdbg \ ---enable-fpm \ ---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 \ ---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-enchant=/usr \ ---enable-sysvmsg \ ---with-ffi \ ---with-sodium \ ---enable-zend-test=shared \ ---enable-dl-test=shared \ ---enable-werror \ ---with-pear - -if [[ -z "$CONFIG_ONLY" ]]; then - MAKE_JOBS=${MAKE_JOBS:-$(nproc)} - make "-j${MAKE_JOBS}" $MAKE_QUIET - make install -fi diff --git a/travis/setup-mysql.sh b/travis/setup-mysql.sh deleted file mode 100755 index 1199fceb220..00000000000 --- a/travis/setup-mysql.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -set -ev - -mysql -vvv -e "CREATE DATABASE IF NOT EXISTS test" diff --git a/travis/setup-pgsql.sh b/travis/setup-pgsql.sh deleted file mode 100755 index 3fea8f70b42..00000000000 --- a/travis/setup-pgsql.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -set -ev - -# PostgreSQL tests currently don't work on some architectures. -if test -z "${ARM64}${S390X}"; then - psql -c "ALTER USER postgres PASSWORD 'postgres';" -U postgres - psql -c "CREATE DATABASE test;" -U postgres -fi diff --git a/travis/test.sh b/travis/test.sh deleted file mode 100755 index 92253042751..00000000000 --- a/travis/test.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -set -ex - -# ARM64 CI reports nproc=32, which is excessive. -if [ -z "$ARM64" ]; then export JOBS=$(nproc); else export JOBS=16; fi - -export SKIP_SLOW_TESTS=1 -export SKIP_IO_CAPTURE_TESTS=1 -./sapi/cli/php run-tests.php -P \ - -g "FAIL,SKIP,BORK,LEAK" --offline --show-diff --show-slow 1000 \ - --no-progress \ - --set-timeout 120 -j$JOBS \ - -d extension=`pwd`/modules/zend_test.so \ - -d zend_extension=`pwd`/modules/opcache.so \ - -d opcache.enable_cli=1 \ - -d opcache.protect_memory=1 \ - "$@"