diff --git a/.drone.yml b/.drone.yml index 9c6405d9..bccf52c4 100644 --- a/.drone.yml +++ b/.drone.yml @@ -176,24 +176,6 @@ trigger: - pull_request - push ---- -kind: pipeline -name: php74-master - -steps: - - name: php74-master - image: ghcr.io/nextcloud/continuous-integration-php7.4:latest - commands: - - make test-master - -trigger: - branch: - - master - - stable* - event: - - pull_request - - push - --- kind: pipeline name: php80-master diff --git a/index.php b/index.php index 03b55585..df310dae 100644 --- a/index.php +++ b/index.php @@ -341,9 +341,13 @@ private function getExpectedElementsList() { 'index.html', 'indie.json', '.user.ini', + 'composer.json', + 'composer.lock', 'console.php', 'cron.php', 'index.php', + 'package.json', + 'package-lock.json', 'public.php', 'remote.php', 'status.php', diff --git a/lib/Updater.php b/lib/Updater.php index b527e8d7..6290a4c0 100644 --- a/lib/Updater.php +++ b/lib/Updater.php @@ -224,9 +224,13 @@ private function getExpectedElementsList() { 'index.html', 'indie.json', '.user.ini', + 'composer.json', + 'composer.lock', 'console.php', 'cron.php', 'index.php', + 'package.json', + 'package-lock.json', 'public.php', 'remote.php', 'status.php', diff --git a/tests/features/master.feature b/tests/features/master.feature index 888fa8b7..0bc2bea1 100644 --- a/tests/features/master.feature +++ b/tests/features/master.feature @@ -7,6 +7,6 @@ Feature: CLI updater - master base And the version number is decreased in the config.php to enforce upgrade When the CLI updater is run successfully And the output should contain "Update successful" - Then the installed version should be 22.0 + Then the installed version should be 28.0 And maintenance mode should be off And upgrade is not required diff --git a/updater.phar b/updater.phar index a97391c2..c392896e 100755 Binary files a/updater.phar and b/updater.phar differ