require Nextcloud 25
This commit is contained in:
parent
172f96866d
commit
e464a7b10d
|
@ -67,7 +67,7 @@ jobs:
|
|||
php-version: ${{ env.PHP_VERSION }}
|
||||
- name: Determine minimum Nextcloud API version
|
||||
if: matrix.version == 'min'
|
||||
run: echo "NC_API_TAG=^$(php tests/nextcloud-version.php --appinfo)" >> $GITHUB_ENV
|
||||
run: echo "NC_API_TAG=dev-stable$(php tests/nextcloud-version.php --appinfo)" >> $GITHUB_ENV
|
||||
- name: Install Dependencies
|
||||
run: |
|
||||
composer require --dev nextcloud/ocp:$NC_API_TAG
|
||||
|
|
|
@ -23,7 +23,7 @@ The Notes app is a distraction free notes taking app for [Nextcloud](https://www
|
|||
<screenshot small-thumbnail="https://raw.githubusercontent.com/nextcloud/screenshots/master/apps/Notes/notes-thumbnail.jpg">https://raw.githubusercontent.com/nextcloud/screenshots/master/apps/Notes/notes.png</screenshot>
|
||||
<dependencies>
|
||||
<php min-version="7.4" max-version="8.1" />
|
||||
<nextcloud min-version="22" max-version="26" />
|
||||
<nextcloud min-version="25" max-version="27" />
|
||||
</dependencies>
|
||||
<repair-steps>
|
||||
<post-migration>
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"require-dev": {
|
||||
"nextcloud/ocp": ">=22",
|
||||
"nextcloud/ocp": "dev-stable25@dev",
|
||||
"nextcloud/coding-standard": "^1.0",
|
||||
"friendsofphp/php-cs-fixer": "^3",
|
||||
"squizlabs/php_codesniffer": "^3",
|
||||
|
@ -13,6 +13,5 @@
|
|||
"OCA\\Notes\\Tests\\API\\": "tests/api/"
|
||||
}
|
||||
},
|
||||
"minimum-stability": "beta",
|
||||
"prefer-stable": true
|
||||
}
|
||||
|
|
|
@ -16,9 +16,10 @@ function getNCVersionFromComposer($path) {
|
|||
$v = getValidProperty($dev, 'nextcloud/ocp');
|
||||
if (substr($v, 0, 1) == '^') {
|
||||
$v = substr($v, 1);
|
||||
}
|
||||
if (substr($v, 0, 2) == '>=') {
|
||||
} elseif (substr($v, 0, 2) == '>=') {
|
||||
$v = substr($v, 2);
|
||||
} elseif (substr($v, 0, 10) == 'dev-stable') {
|
||||
$v = substr($v, 10);
|
||||
}
|
||||
return $v;
|
||||
}
|
||||
|
@ -127,12 +128,11 @@ try {
|
|||
$vComposer = getNCVersionFromComposer(__DIR__.'/../composer.json');
|
||||
if ($vComposer === 'dev-master') {
|
||||
$vComposer = getNCVersionFromComposerBranchAlias(__DIR__.'/../vendor/nextcloud/ocp/composer.json');
|
||||
$vAppInfo = getDependencyVersionFromAppInfo($pathAppInfo, 'nextcloud', 'max');
|
||||
$type = 'max';
|
||||
} else {
|
||||
$vAppInfo = getDependencyVersionFromAppInfo($pathAppInfo, 'nextcloud', 'min');
|
||||
$type = 'min';
|
||||
}
|
||||
$vAppInfo = getDependencyVersionFromAppInfo($pathAppInfo, 'nextcloud', $type);
|
||||
echo $type.': '.$vAppInfo.' (AppInfo) vs. '.$vComposer.' (Composer) => ';
|
||||
if (versionCompare($vComposer, $vAppInfo, $type)) {
|
||||
echo 'OK'.PHP_EOL;
|
||||
|
|
Loading…
Reference in New Issue