Skip to content

Commit 7514e06

Browse files
Merge pull request #503 from nextcloud/chore/fix-ci-issues
chore: fix CI issues
2 parents 6f15612 + 988ff8a commit 7514e06

7 files changed

Lines changed: 238 additions & 196 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# SPDX-License-Identifier: AGPL-3.0-or-later
33
/build/
44
/vendor/
5+
/vendor-bin/**/vendor/
56
.php-cs-fixer.cache
67
/node_modules/
78
/cypress/screenshots/

REUSE.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,9 @@ path = ["img/app.svg"]
4646
precedence = "aggregate"
4747
SPDX-FileCopyrightText = "2018-2024 Google LLC"
4848
SPDX-License-Identifier = "Apache-2.0"
49+
50+
[[annotations]]
51+
path = ["vendor-bin/**"]
52+
precedence = "aggregate"
53+
SPDX-FileCopyrightText = "none"
54+
SPDX-License-Identifier = "CC0-1.0"

templates/Settings/personal.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
style('data_request', 'style');
88
script('data_request', ['init', 'app']);
99

10-
1110
?>
1211

1312
<div id="data-request" class="section">

tests/unit/Services/RequestTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@ public function testTemplates($method, $templateId, $expectedSubject) {
142142
$this->assertSame($template, $result);
143143
}
144144

145-
146145
public function adminProvider() {
147146
$admin1 = $this->createMock(IUser::class);
148147

vendor-bin/cs-fixer/composer.lock

Lines changed: 31 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor-bin/phpunit/composer.lock

Lines changed: 10 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)