Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Remove old travis related stuff #48220

Merged
merged 2 commits into from
Sep 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/integration-dav.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,9 @@ jobs:

- name: Run CalDAVTester
run: |
cp "apps/dav/tests/travis/caldavtest/serverinfo-${{ matrix.endpoint }}${{ matrix.endpoint == 'old' && (matrix.service == 'CardDAV' && '-carddav' || '-caldav') || '' }}-endpoint.xml" "apps/dav/tests/travis/caldavtest/serverinfo.xml"
cp "apps/dav/tests/testsuits/caldavtest/serverinfo-${{ matrix.endpoint }}${{ matrix.endpoint == 'old' && (matrix.service == 'CardDAV' && '-carddav' || '-caldav') || '' }}-endpoint.xml" "apps/dav/tests/testsuits/caldavtest/serverinfo.xml"
pushd CalDAVTester
PYTHONPATH="../pycalendar/src" python testcaldav.py --print-details-onfail --basedir "../apps/dav/tests/travis/caldavtest" -o cdt.txt \
PYTHONPATH="../pycalendar/src" python testcaldav.py --print-details-onfail --basedir "../apps/dav/tests/testsuits/caldavtest" -o cdt.txt \
"${{ matrix.service }}/current-user-principal.xml" \
"${{ matrix.service }}/sync-report.xml" \
${{ matrix.endpoint == 'new' && format('{0}/sharing-{1}.xml', matrix.service, matrix.service == 'CalDAV' && 'calendars' || 'addressbooks') || ';' }}
Expand Down
4 changes: 2 additions & 2 deletions .reuse/dep5
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Files: themes/example/core/img/favicon-touch.png themes/example/core/img/favicon
Copyright: 2015 ownCloud, Inc., 2016 Nextcloud GmbH and Nextcloud contributors
License: AGPL-3.0-only

Files: tests/data/testapp.zip tests/data/testapp2.zip tests/docker/mariadb/oc.cnf apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/1.txt apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/2.txt apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/3.txt apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/4.txt apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/5.txt apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/6.txt apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/5.ics apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/6.ics apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/7.ics apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/8.ics apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/9.ics apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/sharing/read-write/6.vcf apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/sharing/read-write/7.vcf apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/sharing/read-write/8.vcf apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/sharing/read-write/9.vcf apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/vreports/put/1.vcf apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/vreports/put/2.vcf apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/vreports/put/3.vcf
Files: tests/data/testapp.zip tests/data/testapp2.zip tests/docker/mariadb/oc.cnf apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/1.txt apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/2.txt apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/3.txt apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/4.txt apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/5.txt apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/6.txt apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/5.ics apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/6.ics apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/7.ics apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/8.ics apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/9.ics apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/sharing/read-write/6.vcf apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/sharing/read-write/7.vcf apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/sharing/read-write/8.vcf apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/sharing/read-write/9.vcf apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/vreports/put/1.vcf apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/vreports/put/2.vcf apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/vreports/put/3.vcf
Copyright: 2016 ownCloud, Inc.
License: AGPL-3.0-only

Expand Down Expand Up @@ -147,7 +147,7 @@ Files: build/stubs/app_api.php build/stubs/SensitiveParameter.phpstub build/stub
Copyright: 2023 Nextcloud GmbH and Nextcloud contributors
License: AGPL-3.0-or-later

Files: apps/dav/tests/misc/caldav-search-limit-timerange-1.ics apps/dav/tests/misc/caldav-search-limit-timerange-2.ics apps/dav/tests/misc/caldav-search-limit-timerange-3.ics apps/dav/tests/misc/caldav-search-limit-timerange-4.ics apps/dav/tests/misc/caldav-search-limit-timerange-5.ics apps/dav/tests/misc/caldav-search-limit-timerange-6.ics apps/dav/tests/misc/caldav-search-missing-start-1.ics apps/dav/tests/misc/caldav-search-missing-start-2.ics
Files: apps/dav/tests/unit/test_fixtures/caldav-search-limit-timerange-1.ics apps/dav/tests/unit/test_fixtures/caldav-search-limit-timerange-2.ics apps/dav/tests/unit/test_fixtures/caldav-search-limit-timerange-3.ics apps/dav/tests/unit/test_fixtures/caldav-search-limit-timerange-4.ics apps/dav/tests/unit/test_fixtures/caldav-search-limit-timerange-5.ics apps/dav/tests/unit/test_fixtures/caldav-search-limit-timerange-6.ics apps/dav/tests/unit/test_fixtures/caldav-search-missing-start-1.ics apps/dav/tests/unit/test_fixtures/caldav-search-missing-start-2.ics
Copyright: 2023 Nextcloud GmbH and Nextcloud contributors
License: AGPL-3.0-or-later

Expand Down
11 changes: 0 additions & 11 deletions apps/dav/tests/misc/sharing.xml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" standalone="no"?>

<!DOCTYPE serverinfo SYSTEM
"/home/deepdiver/Development/ownCloud/master/apps/dav/tests/travis/caldavtest/serverinfo.dtd">
<!DOCTYPE serverinfo SYSTEM "./serverinfo.dtd">

<!--
- SPDX-FileCopyrightText: 2006-2015 Apple Inc. All rights reserved.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" standalone="no"?>

<!DOCTYPE serverinfo SYSTEM
"/home/deepdiver/Development/ownCloud/master/apps/dav/tests/travis/caldavtest/serverinfo.dtd">
<!DOCTYPE serverinfo SYSTEM "./serverinfo.dtd">

<!--
- SPDX-FileCopyrightText: 2006-2015 Apple Inc. All rights reserved.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" standalone="no"?>

<!DOCTYPE serverinfo SYSTEM
"/home/deepdiver/Development/ownCloud/master/apps/dav/tests/travis/caldavtest/serverinfo.dtd">
<!DOCTYPE serverinfo SYSTEM "./serverinfo.dtd">

<!--
- SPDX-FileCopyrightText: 2006-2015 Apple Inc. All rights reserved.
Expand Down
46 changes: 23 additions & 23 deletions apps/dav/tests/unit/CalDAV/CalDavBackendTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ public function providesSharingData() {
public function testCalendarSharing($userCanRead, $userCanWrite, $groupCanRead, $groupCanWrite, $add, $principals): void {
$logger = $this->createMock(\Psr\Log\LoggerInterface::class);
$config = $this->createMock(IConfig::class);
/** @var IL10N|MockObject $l10n */

$l10n = $this->createMock(IL10N::class);
$l10n->expects($this->any())
->method('t')
Expand Down Expand Up @@ -1655,12 +1655,12 @@ public function testSearchWithLimitAndTimeRange(): void {
];

$testFiles = [
__DIR__ . '/../../misc/caldav-search-limit-timerange-1.ics',
__DIR__ . '/../../misc/caldav-search-limit-timerange-2.ics',
__DIR__ . '/../../misc/caldav-search-limit-timerange-3.ics',
__DIR__ . '/../../misc/caldav-search-limit-timerange-4.ics',
__DIR__ . '/../../misc/caldav-search-limit-timerange-5.ics',
__DIR__ . '/../../misc/caldav-search-limit-timerange-6.ics',
__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-1.ics',
__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-2.ics',
__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-3.ics',
__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-4.ics',
__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-5.ics',
__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-6.ics',
];

foreach ($testFiles as $testFile) {
Expand Down Expand Up @@ -1712,12 +1712,12 @@ public function testSearchWithLimitAndTimeRangeShouldNotReturnMoreObjectsThenLim
];

$testFiles = [
__DIR__ . '/../../misc/caldav-search-limit-timerange-1.ics',
__DIR__ . '/../../misc/caldav-search-limit-timerange-2.ics',
__DIR__ . '/../../misc/caldav-search-limit-timerange-3.ics',
__DIR__ . '/../../misc/caldav-search-limit-timerange-4.ics',
__DIR__ . '/../../misc/caldav-search-limit-timerange-5.ics',
__DIR__ . '/../../misc/caldav-search-limit-timerange-6.ics',
__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-1.ics',
__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-2.ics',
__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-3.ics',
__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-4.ics',
__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-5.ics',
__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-6.ics',
];

foreach ($testFiles as $testFile) {
Expand Down Expand Up @@ -1762,12 +1762,12 @@ public function testSearchWithLimitAndTimeRangeShouldReturnObjectsInTheSameOrder
];

$testFiles = [
__DIR__ . '/../../misc/caldav-search-limit-timerange-1.ics',
__DIR__ . '/../../misc/caldav-search-limit-timerange-2.ics',
__DIR__ . '/../../misc/caldav-search-limit-timerange-3.ics',
__DIR__ . '/../../misc/caldav-search-limit-timerange-4.ics',
__DIR__ . '/../../misc/caldav-search-limit-timerange-6.ics', // <-- intentional!
__DIR__ . '/../../misc/caldav-search-limit-timerange-5.ics',
__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-1.ics',
__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-2.ics',
__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-3.ics',
__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-4.ics',
__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-6.ics', // <-- intentional!
__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-5.ics',
];

foreach ($testFiles as $testFile) {
Expand Down Expand Up @@ -1819,10 +1819,10 @@ public function testSearchShouldReturnObjectsInTheSameOrderMissingDate(): void {
];

$testFiles = [
__DIR__ . '/../../misc/caldav-search-limit-timerange-6.ics', // <-- intentional!
__DIR__ . '/../../misc/caldav-search-limit-timerange-5.ics',
__DIR__ . '/../../misc/caldav-search-missing-start-1.ics',
__DIR__ . '/../../misc/caldav-search-missing-start-2.ics',
__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-6.ics', // <-- intentional!
__DIR__ . '/../test_fixtures/caldav-search-limit-timerange-5.ics',
__DIR__ . '/../test_fixtures/caldav-search-missing-start-1.ics',
__DIR__ . '/../test_fixtures/caldav-search-missing-start-2.ics',
];

foreach ($testFiles as $testFile) {
Expand Down
1 change: 0 additions & 1 deletion apps/dav/tests/unit/phpunit.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,3 @@
<log type="coverage-clover" target="./clover.xml"/>
</logging>
</phpunit>

2 changes: 1 addition & 1 deletion apps/settings/.editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion apps/updatenotification/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 0 additions & 1 deletion core/vendor/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ src/
bower.json
component.json
.jshintrc
.travis.yml
CHANGELOG*
Gemfile
gruntfile.js
Expand Down
3 changes: 1 addition & 2 deletions lib/private/legacy/OC_Util.php
Original file line number Diff line number Diff line change
Expand Up @@ -545,8 +545,7 @@ public static function checkServer(\OC\SystemConfig $config) {
// 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',
Expand Down
5 changes: 0 additions & 5 deletions tests/lib/TestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -533,11 +533,6 @@ protected function getGroupAnnotations(): array {
}

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)) {
Expand Down
41 changes: 0 additions & 41 deletions tests/travis/before_install.sh

This file was deleted.

19 changes: 0 additions & 19 deletions tests/travis/changed_app.sh

This file was deleted.

6 changes: 0 additions & 6 deletions tests/travis/custom.ini

This file was deleted.

Loading
Loading