aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFerdinand Thiessen <opensource@fthiessen.de>2024-09-19 18:37:09 +0200
committerFerdinand Thiessen <opensource@fthiessen.de>2024-09-19 20:16:29 +0200
commit7ae7f7fd12154eb73e02ad0cd0877ac23eb41e8c (patch)
tree2a74e3373a962bc6c008afafe2e0ce885f2cd0e2
parent75f5cb76300ca754f141573e76e029efb9369e51 (diff)
downloadnextcloud-server-7ae7f7fd12154eb73e02ad0cd0877ac23eb41e8c.tar.gz
nextcloud-server-7ae7f7fd12154eb73e02ad0cd0877ac23eb41e8c.zip
chore: Remove old travis related stuff
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
-rw-r--r--apps/settings/.editorconfig2
-rw-r--r--apps/updatenotification/Makefile1
-rw-r--r--core/vendor/.gitignore1
-rw-r--r--lib/private/legacy/OC_Util.php3
-rw-r--r--tests/lib/TestCase.php5
-rw-r--r--tests/travis/before_install.sh41
-rwxr-xr-xtests/travis/changed_app.sh19
-rw-r--r--tests/travis/custom.ini6
-rwxr-xr-xtests/travis/install.sh182
9 files changed, 2 insertions, 258 deletions
diff --git a/apps/settings/.editorconfig b/apps/settings/.editorconfig
index e9391ffef4d..fab810415cf 100644
--- a/apps/settings/.editorconfig
+++ b/apps/settings/.editorconfig
@@ -9,6 +9,6 @@ end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
-[{package.json,.travis.yml,webpack.config.js}]
+[{package.json,webpack.config.js}]
indent_style = space
indent_size = 2 \ No newline at end of file
diff --git a/apps/updatenotification/Makefile b/apps/updatenotification/Makefile
index 6db98f27cac..b64cd1a6290 100644
--- a/apps/updatenotification/Makefile
+++ b/apps/updatenotification/Makefile
@@ -49,7 +49,6 @@ package: clean build-js-production
--exclude=/SECURITY.md \
--exclude=/.gitignore \
--exclude=/.scrutinizer.yml \
- --exclude=/.travis.yml \
--exclude=/.drone.yml \
--exclude=/node_modules \
--exclude=/npm-debug.log \
diff --git a/core/vendor/.gitignore b/core/vendor/.gitignore
index 1d5553f369a..478ced55415 100644
--- a/core/vendor/.gitignore
+++ b/core/vendor/.gitignore
@@ -6,7 +6,6 @@ src/
bower.json
component.json
.jshintrc
-.travis.yml
CHANGELOG*
Gemfile
gruntfile.js
diff --git a/lib/private/legacy/OC_Util.php b/lib/private/legacy/OC_Util.php
index 0c8fcc56f32..a6478ae11f8 100644
--- a/lib/private/legacy/OC_Util.php
+++ b/lib/private/legacy/OC_Util.php
@@ -545,8 +545,7 @@ class OC_Util {
// defined = defined
// ini = ini_get
// If the dependency is not found the missing module name is shown to the EndUser
- // When adding new checks always verify that they pass on Travis as well
- // for ini settings, see https://github.com/owncloud/administration/blob/master/travis-ci/custom.ini
+ // When adding new checks always verify that they pass on CI as well
$dependencies = [
'classes' => [
'ZipArchive' => 'zip',
diff --git a/tests/lib/TestCase.php b/tests/lib/TestCase.php
index d74dacd76c1..cfed2b06c61 100644
--- a/tests/lib/TestCase.php
+++ b/tests/lib/TestCase.php
@@ -533,11 +533,6 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase {
}
protected function IsDatabaseAccessAllowed() {
- // on travis-ci.org we allow database access in any case - otherwise
- // this will break all apps right away
- if (getenv('TRAVIS') == true) {
- return true;
- }
$annotations = $this->getGroupAnnotations();
if (isset($annotations)) {
if (in_array('DB', $annotations) || in_array('SLOWDB', $annotations)) {
diff --git a/tests/travis/before_install.sh b/tests/travis/before_install.sh
deleted file mode 100644
index b05e93e856f..00000000000
--- a/tests/travis/before_install.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-#
-# SPDX-FileCopyrightText: 2015 ownCloud, Inc.
-# SPDX-License-Identifier: AGPL-3.0-only
-#
-# @author Thomas Müller
-# @copyright 2014 Thomas Müller thomas.mueller@tmit.eu
-#
-
-set -e
-
-WORKDIR=$PWD
-DB=$1
-echo "Work directory: $WORKDIR"
-echo "Database: $DB"
-
-if [ "$DB" == "mysql" ] ; then
- echo "Setting up mysql ..."
- mysql -e 'create database oc_autotest;'
- mysql -u root -e "CREATE USER 'oc_autotest'@'localhost' IDENTIFIED BY 'owncloud'";
- mysql -u root -e "grant all on oc_autotest.* to 'oc_autotest'@'localhost'";
- mysql -e "SELECT User FROM mysql.user;"
-fi
-
-if [ "$DB" == "pgsql" ] ; then
- createuser -U travis -s oc_autotest
-fi
-
-#if [ "$DB" == "oracle" ] ; then
-# if [ ! -f before_install_oracle.sh ]; then
-# wget https://raw.githubusercontent.com/owncloud/administration/master/travis-ci/before_install_oracle.sh
-# fi
-# bash ./before_install_oracle.sh
-#fi
-
-#
-# copy custom php.ini settings
-#
-if [ $(phpenv version-name) != 'hhvm' ]; then
- phpenv config-add tests/travis/custom.ini
-fi
diff --git a/tests/travis/changed_app.sh b/tests/travis/changed_app.sh
deleted file mode 100755
index 59410788bd9..00000000000
--- a/tests/travis/changed_app.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-#
-# SPDX-FileCopyrightText: 2015 ownCloud, Inc.
-# SPDX-License-Identifier: AGPL-3.0-only
-#
-# @author Joas Schilling
-# @author Thomas Müller
-# @copyright 2015 Thomas Müller thomas.mueller@tmit.eu
-#
-
-APP=$1
-
-FOUND=$(git diff ${TRAVIS_COMMIT_RANGE} | grep -- "^+++ b/apps/$APP/")
-
-if [ "x$FOUND" != 'x' ]; then
- echo "1"
-else
- echo "0"
-fi
diff --git a/tests/travis/custom.ini b/tests/travis/custom.ini
deleted file mode 100644
index 6eea6fb5cec..00000000000
--- a/tests/travis/custom.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-# SPDX-FileCopyrightText: 2015 ownCloud, Inc.
-# SPDX-License-Identifier: AGPL-3.0-only
-always_populate_raw_post_data = -1
-mbstring.func_overload = 0
-default_charset = 'UTF-8'
-output_buffering = off
diff --git a/tests/travis/install.sh b/tests/travis/install.sh
deleted file mode 100755
index bfedb45caa3..00000000000
--- a/tests/travis/install.sh
+++ /dev/null
@@ -1,182 +0,0 @@
-#!/bin/bash
-#
-# SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
-# SPDX-FileCopyrightText: 2016 ownCloud, Inc.
-# SPDX-License-Identifier: AGPL-3.0-only
-#
-# @author Thomas Müller
-# @copyright 2014 Thomas Müller thomas.mueller@tmit.eu
-#
-
-set -e
-
-DATABASENAME=oc_autotest
-DATABASEUSER=oc_autotest
-ADMINLOGIN=admin
-BASEDIR=$PWD
-
-DBCONFIGS="sqlite mysql pgsql oracle"
-PHPUNIT=$(which phpunit)
-
-# set oracle home if it is not set
-TRAVIS_ORACLE_HOME="/usr/lib/oracle/xe/app/oracle/product/10.2.0/server"
-[ -z "$ORACLE_HOME" ] && ORACLE_HOME=$TRAVIS_ORACLE_HOME
-
-if [ $1 ]; then
- FOUND=0
- for DBCONFIG in $DBCONFIGS; do
- if [ $1 = $DBCONFIG ]; then
- FOUND=1
- break
- fi
- done
- if [ $FOUND = 0 ]; then
- echo -e "Unknown database config name \"$1\"\n" >&2
- print_syntax
- exit 2
- fi
-fi
-
-# use tmpfs for datadir - should speedup unit test execution
-DATADIR=$BASEDIR/data-autotest
-
-echo "Using database $DATABASENAME"
-
-# create autoconfig for sqlite, mysql and postgresql
-cat > ./tests/autoconfig-sqlite.php <<DELIM
-<?php
-\$AUTOCONFIG = array (
- 'installed' => false,
- 'dbtype' => 'sqlite',
- 'dbtableprefix' => 'oc_',
- 'adminlogin' => '$ADMINLOGIN',
- 'adminpass' => 'admin',
- 'directory' => '$DATADIR',
-);
-DELIM
-
-cat > ./tests/autoconfig-mysql.php <<DELIM
-<?php
-\$AUTOCONFIG = array (
- 'installed' => false,
- 'dbtype' => 'mysql',
- 'dbtableprefix' => 'oc_',
- 'adminlogin' => '$ADMINLOGIN',
- 'adminpass' => 'admin',
- 'directory' => '$DATADIR',
- 'dbuser' => '$DATABASEUSER',
- 'dbname' => '$DATABASENAME',
- 'dbhost' => 'localhost',
- 'dbpass' => 'owncloud',
-);
-DELIM
-
-cat > ./tests/autoconfig-pgsql.php <<DELIM
-<?php
-\$AUTOCONFIG = array (
- 'installed' => false,
- 'dbtype' => 'pgsql',
- 'dbtableprefix' => 'oc_',
- 'adminlogin' => '$ADMINLOGIN',
- 'adminpass' => 'admin',
- 'directory' => '$DATADIR',
- 'dbuser' => '$DATABASEUSER',
- 'dbname' => '$DATABASENAME',
- 'dbhost' => 'localhost',
- 'dbpass' => '',
-);
-DELIM
-
-cat > ./tests/autoconfig-oracle.php <<DELIM
-<?php
-\$AUTOCONFIG = array (
- 'installed' => false,
- 'dbtype' => 'oci',
- 'dbtableprefix' => 'oc_',
- 'adminlogin' => '$ADMINLOGIN',
- 'adminpass' => 'admin',
- 'directory' => '$DATADIR',
- 'dbuser' => '$DATABASENAME',
- 'dbname' => 'XE',
- 'dbhost' => 'localhost',
- 'dbpass' => 'owncloud',
- 'loglevel' => 0,
-);
-DELIM
-
-function execute_tests {
- echo "Setup environment for $1 testing ..."
- # back to root folder
- cd $BASEDIR
-
- # revert changes to tests/data
- git checkout tests/data/*
-
- # reset data directory
- rm -rf $DATADIR
- mkdir $DATADIR
-
- cp tests/preseed-config.php config/config.php
-
- if [ "$1" == "oracle" ] ; then
- echo "Load Oracle environment variables so that we can run 'sqlplus'."
- . $ORACLE_HOME/bin/oracle_env.sh
-
- echo "create the database"
- sqlplus -s -l / as sysdba <<EOF
- create user $DATABASENAME identified by owncloud;
- alter user $DATABASENAME default tablespace users
- temporary tablespace temp
- quota unlimited on users;
- grant create session
- , create table
- , create procedure
- , create sequence
- , create trigger
- , create view
- , create synonym
- , alter session
- to $DATABASENAME;
- exit;
-EOF
- fi
-
- # copy autoconfig
- cp $BASEDIR/tests/autoconfig-$1.php $BASEDIR/config/autoconfig.php
-
- # trigger installation
- echo "INDEX"
- php -f index.php
- echo "END INDEX"
-
- #test execution
- cd tests
- #php -f enable_all.php
-}
-
-#
-# start test execution
-#
-if [ -z "$1" ]
- then
- # run all known database configs
- for DBCONFIG in $DBCONFIGS; do
- execute_tests $DBCONFIG
- done
-else
- execute_tests $1 $2 $3
-fi
-
-# show environment
-echo "owncloud configuration:"
-cat $BASEDIR/config/config.php
-
-
-echo "data directory:"
-ls -ll $DATADIR
-
-echo "nextcloud.log:"
-[ -f "$DATADIR/nextcloud.log" ] && cat $DATADIR/nextcloud.log
-[ -f "$BASEDIR/data/nextcloud.log" ] && cat $BASEDIR/data/nextcloud.log
-
-cd $BASEDIR