From 2803f04d353671e1e37df21e3a034d91b9e231f2 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 22 Sep 2023 14:08:36 +0200 Subject: [PATCH 1/3] [ticket/17195] Remove travis CI files PHPBB3-17195 --- travis/check-doctum-parse-errors.sh | 34 -------------- travis/check-executable-files.sh | 69 ----------------------------- travis/check-image-icc-profiles.sh | 21 --------- travis/check-js.sh | 25 ----------- travis/check-stylesheet.sh | 24 ---------- travis/ext-sniff.sh | 27 ----------- travis/ldap/base.ldif | 41 ----------------- travis/ldap/slapd.conf | 17 ------- travis/phing-sniff.sh | 23 ---------- travis/phpunit-mariadb-travis.xml | 39 ---------------- travis/phpunit-mysqli-travis.xml | 41 ----------------- travis/phpunit-postgres-travis.xml | 41 ----------------- travis/phpunit-sqlite3-travis.xml | 41 ----------------- travis/prepare-extension.sh | 22 --------- travis/setup-database.sh | 37 ---------------- travis/setup-exiftool.sh | 14 ------ travis/setup-ldap.sh | 23 ---------- travis/setup-mariadb.sh | 55 ----------------------- travis/setup-mysql8.sh | 20 --------- travis/setup-php-extensions.sh | 66 --------------------------- travis/setup-phpbb.sh | 52 ---------------------- travis/setup-unbuffer.sh | 14 ------ travis/setup-webserver.sh | 66 --------------------------- 23 files changed, 812 deletions(-) delete mode 100755 travis/check-doctum-parse-errors.sh delete mode 100755 travis/check-executable-files.sh delete mode 100755 travis/check-image-icc-profiles.sh delete mode 100755 travis/check-js.sh delete mode 100755 travis/check-stylesheet.sh delete mode 100755 travis/ext-sniff.sh delete mode 100644 travis/ldap/base.ldif delete mode 100644 travis/ldap/slapd.conf delete mode 100755 travis/phing-sniff.sh delete mode 100644 travis/phpunit-mariadb-travis.xml delete mode 100644 travis/phpunit-mysqli-travis.xml delete mode 100644 travis/phpunit-postgres-travis.xml delete mode 100644 travis/phpunit-sqlite3-travis.xml delete mode 100755 travis/prepare-extension.sh delete mode 100755 travis/setup-database.sh delete mode 100755 travis/setup-exiftool.sh delete mode 100755 travis/setup-ldap.sh delete mode 100755 travis/setup-mariadb.sh delete mode 100755 travis/setup-mysql8.sh delete mode 100755 travis/setup-php-extensions.sh delete mode 100755 travis/setup-phpbb.sh delete mode 100755 travis/setup-unbuffer.sh delete mode 100755 travis/setup-webserver.sh diff --git a/travis/check-doctum-parse-errors.sh b/travis/check-doctum-parse-errors.sh deleted file mode 100755 index d23ed2f2ca..0000000000 --- a/travis/check-doctum-parse-errors.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -# -# This file is part of the phpBB Forum Software package. -# -# @copyright (c) phpBB Limited -# @license GNU General Public License, version 2 (GPL-2.0) -# -# For full copyright and license information, please see -# the docs/CREDITS.txt file. -# -set -e - -DB=$1 -TRAVIS_PHP_VERSION=$2 -NOTESTS=$3 - -if [ "$NOTESTS" == '1' ] -then - if [ ! -f doctum.phar ]; then - # Download the latest (5.x.x) release if the file does not exist - # Remove it to update your phar - curl -O https://doctum.long-term.support/releases/5/doctum.phar - rm -f doctum.phar.sha256 - curl -O https://doctum.long-term.support/releases/5/doctum.phar.sha256 - sha256sum --strict --check doctum.phar.sha256 - rm -f doctum.phar.sha256 - chmod +x ./doctum.phar - # You can fetch the latest (5.x.x) version code here: - # https://doctum.long-term.support/releases/5/VERSION - fi - # Show the version to inform users of the script - ./doctum.phar version --text - ./doctum.phar parse build/doctum-checkout.conf.php -v -fi diff --git a/travis/check-executable-files.sh b/travis/check-executable-files.sh deleted file mode 100755 index 6899373c1e..0000000000 --- a/travis/check-executable-files.sh +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/bash -# -# This file is part of the phpBB Forum Software package. -# -# @copyright (c) phpBB Limited -# @license GNU General Public License, version 2 (GPL-2.0) -# -# For full copyright and license information, please see -# the docs/CREDITS.txt file. -# -set -e - -DB=$1 -TRAVIS_PHP_VERSION=$2 -NOTESTS=$3 -root="$4" -path="${root}phpBB/" - -if [ "$NOTESTS" == '1' ] -then - # Check the permissions of the files - - # The following variables MUST NOT contain any wildcard - # Directories to skip - directories_skipped="-path ${path}develop -o -path ${path}vendor" - - # Files to skip - files_skipped="-false" - - # Files which have to be executable - executable_files="-path ${path}bin/* -o -path ${path}install/phpbbcli.php" - - incorrect_files=$( \ - find ${path} \ - '(' \ - '(' \ - ${directories_skipped} \ - ')' \ - -a -type d -prune -a -type f \ - ')' -o \ - '(' \ - -type f -a \ - -not '(' \ - ${files_skipped} \ - ')' -a \ - '(' \ - '(' \ - '(' \ - ${executable_files} \ - ')' -a \ - -not -perm /100 \ - ')' -o \ - '(' \ - -not '(' \ - ${executable_files} \ - ')' -a \ - -perm /111 \ - ')' \ - ')' \ - ')' \ - ) - - if [ "${incorrect_files}" != '' ] - then - echo "The following files do not have proper permissions:"; - ls -la ${incorrect_files} - exit 1; - fi -fi diff --git a/travis/check-image-icc-profiles.sh b/travis/check-image-icc-profiles.sh deleted file mode 100755 index 05c7de2d27..0000000000 --- a/travis/check-image-icc-profiles.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -# -# This file is part of the phpBB Forum Software package. -# -# @copyright (c) phpBB Limited -# @license GNU General Public License, version 2 (GPL-2.0) -# -# For full copyright and license information, please see -# the docs/CREDITS.txt file. -# -set -e - -DB=$1 -TRAVIS_PHP_VERSION=$2 -NOTESTS=$3 - -if [ "$NOTESTS" == '1' ] -then - find . -type f -a -iregex '.*\.\(gif\|jpg\|jpeg\|png\)$' -a -not -wholename '*vendor/*' | \ - parallel --gnu --keep-order 'phpBB/develop/strip_icc_profiles.sh {}' -fi diff --git a/travis/check-js.sh b/travis/check-js.sh deleted file mode 100755 index f0894ab280..0000000000 --- a/travis/check-js.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# -# This file is part of the phpBB Forum Software package. -# -# @copyright (c) phpBB Limited -# @license GNU General Public License, version 2 (GPL-2.0) -# -# For full copyright and license information, please see -# the docs/CREDITS.txt file. -# -set -e -set +x - -NOTESTS=$1 - -if [ "$NOTESTS" == '1' ] -then - npm install -g > /dev/null - npm install > /dev/null - set -x - node_modules/xo/cli.js "phpBB/adm/style/*.js" - node_modules/xo/cli.js "phpBB/assets/javascript/*.js" - node_modules/xo/cli.js "phpBB/style/all/js/*.js" - node_modules/xo/cli.js "phpBB/style/prosilver/template/*.js" -fi diff --git a/travis/check-stylesheet.sh b/travis/check-stylesheet.sh deleted file mode 100755 index 743b65db9b..0000000000 --- a/travis/check-stylesheet.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -# -# This file is part of the phpBB Forum Software package. -# -# @copyright (c) phpBB Limited -# @license GNU General Public License, version 2 (GPL-2.0) -# -# For full copyright and license information, please see -# the docs/CREDITS.txt file. -# -set -e -set +x - -NOTESTS=$1 - -if [ "$NOTESTS" == '1' ] -then - npm install -g > /dev/null - npm install > /dev/null - set -x - node_modules/stylelint/bin/stylelint.js "phpBB/styles/prosilver/theme/*.css" - # Disable admin stylelint for now - node_modules/stylelint/bin/stylelint.js "phpBB/adm/style/*.css" -fi diff --git a/travis/ext-sniff.sh b/travis/ext-sniff.sh deleted file mode 100755 index f346ba6c25..0000000000 --- a/travis/ext-sniff.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -# -# This file is part of the phpBB Forum Software package. -# -# @copyright (c) phpBB Limited -# @license GNU General Public License, version 2 (GPL-2.0) -# -# For full copyright and license information, please see -# the docs/CREDITS.txt file. -# -set -e -set -x - -DB=$1 -TRAVIS_PHP_VERSION=$2 -EXTNAME=$3 -NOTESTS=$4 - -if [ "$NOTESTS" == "1" ] -then - phpBB/vendor/bin/phpcs \ - -s \ - --extensions=php \ - --standard=build/code_sniffer/ruleset-php-extensions.xml \ - --ignore=*/"$EXTNAME"/tests/*,*/"$EXTNAME"/vendor/* \ - phpBB/ext/"$EXTNAME" -fi diff --git a/travis/ldap/base.ldif b/travis/ldap/base.ldif deleted file mode 100644 index 09fe7cecc6..0000000000 --- a/travis/ldap/base.ldif +++ /dev/null @@ -1,41 +0,0 @@ -dn: dc=example,dc=com -objectClass: top -objectClass: dcObject -objectClass: organization -o: example -dc: example - -dn: ou=foo,dc=example,dc=com -objectClass: organizationalUnit -ou: foo - -dn: cn=admin,dc=example,dc=com -objectClass: simpleSecurityObject -objectClass: organizationalRole -cn: admin -description: LDAP administrator -userPassword:: e1NTSEF9NytMR2gveUxTMzdsc3RRd1V1dENZSVA0TWdYdm9SdDY= - -dn: ou=group,dc=example,dc=com -objectClass: organizationalUnit -ou: group - -dn: cn=admin,ou=foo,dc=example,dc=com -objectClass: posixAccount -objectClass: inetOrgPerson -objectClass: organizationalPerson -objectClass: person -loginShell: /bin/bash -homeDirectory: /home/admin -uid: admin -cn: admin -uidNumber: 10000 -gidNumber: 10000 -sn: admin -mail: admin@example.com -userPassword:: e1NTSEF9WHpueGZURHZZc21JSkl6czdMVXBjdCtWYTA1dlMzVlQ= - -dn: cn=admin,ou=group,dc=example,dc=com -objectClass: posixGroup -gidNumber: 10000 -cn: admin diff --git a/travis/ldap/slapd.conf b/travis/ldap/slapd.conf deleted file mode 100644 index 5fce95cee2..0000000000 --- a/travis/ldap/slapd.conf +++ /dev/null @@ -1,17 +0,0 @@ -# See slapd.conf(5) for details on configuration options. -include /etc/ldap/schema/core.schema -include /etc/ldap/schema/cosine.schema -include /etc/ldap/schema/inetorgperson.schema -include /etc/ldap/schema/nis.schema - -pidfile /tmp/slapd/slapd.pid -argsfile /tmp/slapd/slapd.args - -modulepath /usr/lib/openldap - -database ldif -directory /tmp/slapd - -suffix "dc=example,dc=com" -rootdn "cn=admin,dc=example,dc=com" -rootpw adminadmin diff --git a/travis/phing-sniff.sh b/travis/phing-sniff.sh deleted file mode 100755 index 3f43b64130..0000000000 --- a/travis/phing-sniff.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash -# -# This file is part of the phpBB Forum Software package. -# -# @copyright (c) phpBB Limited -# @license GNU General Public License, version 2 (GPL-2.0) -# -# For full copyright and license information, please see -# the docs/CREDITS.txt file. -# -set -e -set -x - -DB=$1 -TRAVIS_PHP_VERSION=$2 -NOTESTS=$3 - -if [ "$NOTESTS" == '1' ] -then - cd build - ../phpBB/vendor/bin/phing sniff - cd .. -fi diff --git a/travis/phpunit-mariadb-travis.xml b/travis/phpunit-mariadb-travis.xml deleted file mode 100644 index 74b3b85483..0000000000 --- a/travis/phpunit-mariadb-travis.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - ../tests - ../tests/functional - ../tests/lint_test.php - - - ../tests/functional - - - - - - slow - - - - - - - - - - - - - - diff --git a/travis/phpunit-mysqli-travis.xml b/travis/phpunit-mysqli-travis.xml deleted file mode 100644 index d14359d618..0000000000 --- a/travis/phpunit-mysqli-travis.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - ../tests - ../tests/functional - ../tests/lint_test.php - - - ../tests/functional - - - - - - slow - - - - - - - - - - - - - - - - diff --git a/travis/phpunit-postgres-travis.xml b/travis/phpunit-postgres-travis.xml deleted file mode 100644 index 3d8376bda1..0000000000 --- a/travis/phpunit-postgres-travis.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - ../tests - ../tests/functional - ../tests/lint_test.php - - - ../tests/functional - - - - - - slow - - - - - - - - - - - - - - - - diff --git a/travis/phpunit-sqlite3-travis.xml b/travis/phpunit-sqlite3-travis.xml deleted file mode 100644 index f5b2b67b22..0000000000 --- a/travis/phpunit-sqlite3-travis.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - ../tests - ../tests/functional - ../tests/lint_test.php - - - ../tests/functional - - - - - - slow - - - - - - - - - - - - - - - - diff --git a/travis/prepare-extension.sh b/travis/prepare-extension.sh deleted file mode 100755 index 4518f935f8..0000000000 --- a/travis/prepare-extension.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -# -# This file is part of the phpBB Forum Software package. -# -# @copyright (c) phpBB Limited -# @license GNU General Public License, version 2 (GPL-2.0) -# -# For full copyright and license information, please see -# the docs/CREDITS.txt file. -# -set -e -set -x - -EXTNAME=$1 -BRANCH=$2 - -# Move the extension in place -mkdir --parents phpBB/ext/$EXTNAME -cp -R ../tmp/* phpBB/ext/$EXTNAME - -# Move the extensions travis/phpunit-*-travis.xml files in place -cp -R travis/* phpBB/ext/$EXTNAME/travis diff --git a/travis/setup-database.sh b/travis/setup-database.sh deleted file mode 100755 index b581ddfccb..0000000000 --- a/travis/setup-database.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash -# -# This file is part of the phpBB Forum Software package. -# -# @copyright (c) phpBB Limited -# @license GNU General Public License, version 2 (GPL-2.0) -# -# For full copyright and license information, please see -# the docs/CREDITS.txt file. -# -set -e -set -x - -DB=$1 -TRAVIS_PHP_VERSION=$2 -NOTESTS=$3 - -if [ "$NOTESTS" == '1' ] -then - exit 0 -fi - -if [ "$DB" == "postgres" ] -then - psql -c 'DROP DATABASE IF EXISTS phpbb_tests;' -U postgres - psql -c 'create database phpbb_tests;' -U postgres -fi - -if [ "$TRAVIS_PHP_VERSION" == "5.6" -a "$DB" == "mysqli" ] -then - mysql -e 'SET GLOBAL storage_engine=MyISAM;' -fi - -if [ "$DB" == "mysqli" -o "$DB" == "mariadb" ] -then - mysql -e 'create database IF NOT EXISTS phpbb_tests;' -fi diff --git a/travis/setup-exiftool.sh b/travis/setup-exiftool.sh deleted file mode 100755 index 04999b8600..0000000000 --- a/travis/setup-exiftool.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# -# This file is part of the phpBB Forum Software package. -# -# @copyright (c) phpBB Limited -# @license GNU General Public License, version 2 (GPL-2.0) -# -# For full copyright and license information, please see -# the docs/CREDITS.txt file. -# -set -e - -sudo apt-get update -sudo apt-get install -y parallel libimage-exiftool-perl diff --git a/travis/setup-ldap.sh b/travis/setup-ldap.sh deleted file mode 100755 index 9be816d77d..0000000000 --- a/travis/setup-ldap.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash -# -# This file is part of the phpBB Forum Software package. -# -# @copyright (c) phpBB Limited -# @license GNU General Public License, version 2 (GPL-2.0) -# -# For full copyright and license information, please see -# the docs/CREDITS.txt file. -# -set -e -set -x - -SLOWTESTS=$1 - -if [ "$SLOWTESTS" == '1' ] -then - sudo apt-get -y install ldap-utils slapd php-ldap - mkdir /tmp/slapd - slapd -f travis/ldap/slapd.conf -h ldap://localhost:3389 & - sleep 3 - ldapadd -h localhost:3389 -D "cn=admin,dc=example,dc=com" -w adminadmin -f travis/ldap/base.ldif -fi diff --git a/travis/setup-mariadb.sh b/travis/setup-mariadb.sh deleted file mode 100755 index 2efe99cc2d..0000000000 --- a/travis/setup-mariadb.sh +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/bash -# -# This file is part of the phpBB Forum Software package. -# -# @copyright (c) phpBB Limited -# @license GNU General Public License, version 2 (GPL-2.0) -# -# For full copyright and license information, please see -# the docs/CREDITS.txt file. -# -set -e -set -x - -# MariaDB Series -VERSION='10.1' - -# Operating system codename, e.g. "precise" -OS_CODENAME=$(lsb_release --codename --short) - -# Manually purge MySQL to remove conflicting files (e.g. /etc/mysql/my.cnf) -sudo apt-get purge -y mysql-common -sudo rm -rf /etc/mysql && sudo rm -rf /var/log/mysql && sudo rm -rf /var/lib/mysql && sudo rm -rf /var/lib/mysql-files && sudo rm -rf /var/lib/mysql-keyring - -if ! which add-apt-repository > /dev/null -then - sudo apt-get update - sudo apt-get install -y python-software-properties -fi - -MIRROR_DOMAIN='ftp.osuosl.org' -sudo apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 0xF1656F24C74CD1D8 -sudo add-apt-repository "deb http://$MIRROR_DOMAIN/pub/mariadb/repo/$VERSION/ubuntu $OS_CODENAME main" -sudo apt-get update - -# Pin repository in order to avoid conflicts with MySQL from distribution -# repository. See https://mariadb.com/kb/en/installing-mariadb-deb-files -# section "Version Mismatch Between MariaDB and Ubuntu/Debian Repositories" -echo " -Package: * -Pin: origin $MIRROR_DOMAIN -Pin-Priority: 1000 -" | sudo tee /etc/apt/preferences.d/mariadb - -sudo debconf-set-selections <<< "mariadb-server-$VERSION mysql-server/root_password password rootpasswd" -sudo debconf-set-selections <<< "mariadb-server-$VERSION mysql-server/root_password_again password rootpasswd" -sudo apt-get install -y mariadb-server - -# Set root password to empty string. -echo " -USE mysql; -UPDATE user SET Password = PASSWORD('') where User = 'root'; -FLUSH PRIVILEGES; -" | mysql -u root -prootpasswd - -mysql --version diff --git a/travis/setup-mysql8.sh b/travis/setup-mysql8.sh deleted file mode 100755 index 3fb16e5159..0000000000 --- a/travis/setup-mysql8.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -# -# This file is part of the phpBB Forum Software package. -# -# @copyright (c) phpBB Limited -# @license GNU General Public License, version 2 (GPL-2.0) -# -# For full copyright and license information, please see -# the docs/CREDITS.txt file. -# -set -e -set -x - -wget https://repo.mysql.com//mysql-apt-config_0.8.15-1_all.deb -sudo dpkg -i mysql-apt-config_0.8.15-1_all.deb -sudo apt-get update -q -sudo apt-get install -q -y --allow-unauthenticated -o Dpkg::Options::=--force-confnew mysql-server -sudo systemctl restart mysql -sudo mysql_upgrade -mysql --version diff --git a/travis/setup-php-extensions.sh b/travis/setup-php-extensions.sh deleted file mode 100755 index 0fcddb044f..0000000000 --- a/travis/setup-php-extensions.sh +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/bash -# -# This file is part of the phpBB Forum Software package. -# -# @copyright (c) phpBB Limited -# @license GNU General Public License, version 2 (GPL-2.0) -# -# For full copyright and license information, please see -# the docs/CREDITS.txt file. -# -set -e -set -x - -function find_php_ini -{ - echo $(php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||") -} - -# $1 - PHP extension name -# $2 - PHP ini file path -function register_php_extension -{ - echo "extension=$1.so" >> "$2" -} - -# $1 - PHP extension name -# $2 - PHP ini file path -function install_php_extension -{ - echo "Installing $1 PHP extension" - - # See http://www.php.net/manual/en/install.pecl.phpize.php - cd "$1" - phpize - ./configure - make - make install - cd .. - - register_php_extension "$1" "$2" -} - -php_ini_file=$(find_php_ini) - -# APCu -if [ `php -r "echo (int) (version_compare(PHP_VERSION, '7.0.0-dev', '>=') && version_compare(PHP_VERSION, '7.3.0-dev', '<'));"` == "1" ] -then - if ! [ "$(pecl info pecl/apcu)" ] - then - echo 'Enabling APCu PHP extension' - printf "\n" | pecl install apcu - echo 'apc.enabled=1' >> "$php_ini_file" - echo 'apc.enable_cli=1' >> "$php_ini_file" - fi -fi - -# Disable xdebug on travis -phpenv config-rm xdebug.ini || true - -# memcached -register_php_extension memcached "$php_ini_file" - -# redis -# Disabled redis for now as it causes travis to fail -# git clone git://github.com/nicolasff/phpredis.git redis -# install_php_extension 'redis' "$php_ini_file" diff --git a/travis/setup-phpbb.sh b/travis/setup-phpbb.sh deleted file mode 100755 index 208b715dfe..0000000000 --- a/travis/setup-phpbb.sh +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/bash -# -# This file is part of the phpBB Forum Software package. -# -# @copyright (c) phpBB Limited -# @license GNU General Public License, version 2 (GPL-2.0) -# -# For full copyright and license information, please see -# the docs/CREDITS.txt file. -# -set -e -set -x - -DB=$1 -TRAVIS_PHP_VERSION=$2 -NOTESTS=$3 -MYSQL8=$4 - -if [ "$NOTESTS" == '1' ] -then - travis/setup-exiftool.sh - travis/setup-unbuffer.sh -fi - -if [ "$DB" == "mariadb" ] -then - travis/setup-mariadb.sh -fi - -if [ "$MYSQL8" == '1' ] -then - travis/setup-mysql8.sh -fi - -if [ "$NOTESTS" != '1' ] -then - travis/setup-php-extensions.sh -fi - -if [ "$NOTESTS" != '1' ] -then - travis/setup-webserver.sh -fi - -cd phpBB -php ../composer.phar install --dev --no-interaction -if [[ "$TRAVIS_PHP_VERSION" =~ ^nightly$ || "$TRAVIS_PHP_VERSION" =~ ^8 ]] -then - php ../composer.phar remove phpunit/dbunit --dev --update-with-dependencies \ - && php ../composer.phar require symfony/yaml:~4.4 misantron/dbunit:~5.0 phpunit/phpunit:^9.3 --dev --update-with-all-dependencies --ignore-platform-reqs -fi -cd .. diff --git a/travis/setup-unbuffer.sh b/travis/setup-unbuffer.sh deleted file mode 100755 index 4423d1b8b6..0000000000 --- a/travis/setup-unbuffer.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# -# This file is part of the phpBB Forum Software package. -# -# @copyright (c) phpBB Limited -# @license GNU General Public License, version 2 (GPL-2.0) -# -# For full copyright and license information, please see -# the docs/CREDITS.txt file. -# -set -e - -sudo apt-get update -sudo apt-get install -y expect-dev diff --git a/travis/setup-webserver.sh b/travis/setup-webserver.sh deleted file mode 100755 index 68bcd6ac00..0000000000 --- a/travis/setup-webserver.sh +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/bash -# -# This file is part of the phpBB Forum Software package. -# -# @copyright (c) phpBB Limited -# @license GNU General Public License, version 2 (GPL-2.0) -# -# For full copyright and license information, please see -# the docs/CREDITS.txt file. -# -set -e -set -x - -sudo apt-get update -sudo apt-get install -y nginx realpath - -sudo service nginx stop - -DIR=$(dirname "$0") -USER=$(whoami) -PHPBB_ROOT_PATH=$(realpath "$DIR/../phpBB") -NGINX_SITE_CONF="/etc/nginx/sites-enabled/default" -NGINX_CONF="/etc/nginx/nginx.conf" -APP_SOCK=$(realpath "$DIR")/php-app.sock -NGINX_PHP_CONF="$DIR/nginx-php.conf" - -# php-fpm -PHP_FPM_BIN="$HOME/.phpenv/versions/$TRAVIS_PHP_VERSION/sbin/php-fpm" -PHP_FPM_CONF="$DIR/php-fpm.conf" - -echo " - [global] - - [travis] - user = $USER - group = $USER - listen = $APP_SOCK - listen.mode = 0666 - pm = static - pm.max_children = 2 - - php_admin_value[memory_limit] = 128M -" > $PHP_FPM_CONF - -sudo $PHP_FPM_BIN \ - --fpm-config "$DIR/php-fpm.conf" - -# nginx -sudo sed -i "s/user www-data;/user $USER;/g" $NGINX_CONF -sudo cp "$DIR/../phpBB/docs/nginx.sample.conf" "$NGINX_SITE_CONF" -sudo sed -i \ - -e "s/example\.com/localhost/g" \ - -e "s|root /path/to/phpbb;|root $PHPBB_ROOT_PATH;|g" \ - $NGINX_SITE_CONF - -# Generate FastCGI configuration for Nginx -echo " -upstream php { - server unix:$APP_SOCK; -} -" > $NGINX_PHP_CONF - -sudo mv "$NGINX_PHP_CONF" /etc/nginx/conf.d/php.conf - -sudo nginx -T -sudo service nginx start From 54ea9e0aefbd606a9fddb49ba755b1c959c031db Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 22 Sep 2023 14:19:48 +0200 Subject: [PATCH 2/3] [ticket/17195] Remove reference to travis [skip ci] PHPBB3-17195 --- tests/functional/extension_controller_test.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/functional/extension_controller_test.php b/tests/functional/extension_controller_test.php index 65e726c484..5c42a2353b 100644 --- a/tests/functional/extension_controller_test.php +++ b/tests/functional/extension_controller_test.php @@ -142,8 +142,8 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c */ public function test_login_redirect() { - $this->markTestIncomplete('Session table contains incorrect data for controllers on travis,' - . 'therefor the redirect fails.'); + $this->markTestIncomplete('Session table contains incorrect data for controllers on CI,' + . 'therefore the redirect fails.'); $crawler = self::request('GET', 'app.php/foo/login_redirect'); $this->assertContainsLang('LOGIN', $crawler->filter('h2')->text()); From 0a395ebb6db862d582a8c809575592b7d55d23ee Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 22 Sep 2023 14:29:53 +0200 Subject: [PATCH 3/3] [ticket/17195] Stop artifically slowing down functional tests PHPBB3-17195 --- tests/test_framework/phpbb_functional_test_case.php | 8 -------- 1 file changed, 8 deletions(-) diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index a5b16082ff..18fe2bbf38 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -48,7 +48,6 @@ class phpbb_functional_test_case extends phpbb_test_case protected static $config = array(); protected static $already_installed = false; - protected static $last_post_timestamp = 0; static public function setUpBeforeClass(): void { @@ -1301,13 +1300,6 @@ class phpbb_functional_test_case extends phpbb_test_case */ protected function submit_message($posting_url, $posting_contains, $form_data) { - if (time() == self::$last_post_timestamp) - { - // Travis is too fast, so we have to wait to not mix up the post/topic order - sleep(1); - } - self::$last_post_timestamp = time(); - $crawler = self::request('GET', $posting_url); $this->assertStringContainsString($this->lang($posting_contains), $crawler->filter('html')->text());