Skip to content
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
10 changes: 9 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,21 @@ updates:
labels:
- "3. to review"
- "dependencies"

# behat
- package-ecosystem: composer
directory: "/tests"
directory: "/vendor-bin/tests"
schedule:
interval: monthly
time: "03:00"
timezone: Europe/Paris
open-pull-requests-limit: 10
reviewers:
- come-nc
- Altahrim
labels:
- "3. to review"
- "dependencies"

# box
- package-ecosystem: composer
Expand Down
14 changes: 7 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,25 +19,25 @@ index.php: lib/UpdateException.php lib/LogException.php lib/Updater.php index.we
cat lib/UpdateException.php lib/LogException.php lib/Updater.php index.web.php| grep -v "^namespace" | awk '/^<\?php$$/,/\*\//{next} 1' >> index.php

test/vendor:
cd tests && composer install
composer bin tests install

test: updater.phar test/vendor
cd tests && vendor/behat/behat/bin/behat
cd tests && ../vendor/bin/behat

test-cli: updater.phar test/vendor
cd tests && vendor/behat/behat/bin/behat features/cli.feature
cd tests && ../vendor/bin/behat features/cli.feature

test-stable24: updater.phar test/vendor
cd tests && vendor/behat/behat/bin/behat features/stable24.feature
cd tests && ../vendor/bin/behat features/stable24.feature

test-stable25: updater.phar test/vendor
cd tests && vendor/behat/behat/bin/behat features/stable25.feature
cd tests && ../vendor/bin/behat features/stable25.feature

test-stable26: updater.phar test/vendor
cd tests && vendor/behat/behat/bin/behat features/stable26.feature
cd tests && ../vendor/bin/behat features/stable26.feature

test-master: updater.phar test/vendor
cd tests && vendor/behat/behat/bin/behat features/master.feature
cd tests && ../vendor/bin/behat features/master.feature

check-same-code-base:
cd tests && php checkSameCodeBase.php
Expand Down
2 changes: 1 addition & 1 deletion REUSE.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ SPDX-FileCopyrightText = "2015 ownCloud, Inc., 2016 Nextcloud GmbH and Nextcloud
SPDX-License-Identifier = "AGPL-3.0-or-later"

[[annotations]]
path = ["updater.phar", "box.json", "tests/composer.json", "tests/composer.lock"]
path = ["updater.phar", "box.json", "vendor-bin/tests/composer.json", "vendor-bin/tests/composer.lock"]
precedence = "aggregate"
SPDX-FileCopyrightText = "2016 Nextcloud GmbH and Nextcloud contributors"
SPDX-License-Identifier = "AGPL-3.0-or-later"
Expand Down
7 changes: 0 additions & 7 deletions tests/composer.json

This file was deleted.

10 changes: 10 additions & 0 deletions vendor-bin/tests/composer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"require-dev": {
"behat/behat": "^3.19"
},
"config": {
"platform": {
"php": "8.1"
}
}
}
Loading